lots of changes...
Merge branch 'master' of https://github.com/ajlin500/WeTheDJ

Conflicts:
	app/app.js