Prepare for heroku upload
Merge branch 'master' of github.com:kourosh/tally
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