Decided to rename functions to have -er endings.
Merge branch 'master' of github.com:wdi-sf-september-2014/github_collaboration_workflow_demo

Conflicts:
	math.rb