Merge pull request #2 from ikitha/master

Started Backbone Setup
Prepare for heroku upload
Merge branch 'master' of github.com:kourosh/tally
Gems for testing
Install pg gem; modify database.yml in preparation for heroku
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
Set up env variables with figaro
Merge branch 'master' of https://github.com/kourosh/tally

Conflicts:
	Gemfile.lock