coupaings
Merge branch 'master' of https://github.com/HackCruisingClub/client

Conflicts:
	app/templates.js