Initial Commit
Fixed tabs & generalized for hackathons
Modified for BoilerMake
Merge branch 'boilermake'

Conflicts:
	src/app.js