grunt
Merge branch 'master' of https://github.com/tmlayton/globalhack

Conflicts:
	public/index.html
	public/views/moneyview.html
touch