Fix merge conflicts between #14 & #17#18

Open

fuhrysteve wants to merge 7 commits into

venmo:masterfrom

fuhrysteve:master

Commits on Dec 9, 2014

Variables can be called with parameters specified in a condition
Alexander Kurihara
committed
Modify tests for variable parameters
Alexander Kurihara
committed
Linting
Alexander Kurihara
committed
Update README with variable parameters
Alexander Kurihara
committed

Commits on Dec 16, 2014

Fix typo in README, rename variables for PEP8
Alexander Kurihara
committed

Commits on Jan 12, 2015

Merge branch 'allow_parameters_on_variables' of github.com:akurihara/business-rules
fuhrysteve
committed

Commits on Jan 13, 2015

Merge branch 'master' of github.com:gregeinfrank/business-rules
fuhrysteve
committed