Gems for testing
Merge branch 'master' of https://github.com/kourosh/tally

Conflicts:
	Gemfile.lock
gemfile.lock merge conflict fix
Merge pull request #3 from JoshuaNotowitz/master

Gems for testing