fixed heroku
Merge branch 'master' of https://github.com/SharangP/git-mo-money
update
Merge branch 'master' of https://github.com/SharangP/git-mo-money

Conflicts:
	GitMoMoney/forms.py