styles, angular moment
Merge branch 'master' of https://github.com/tmlayton/globalhack

Conflicts:
	public/index.html
	public/scripts/98e5d6f1.scripts.js
	public/views/moneyview.html
	public/views/partials/opportunity.html