updates2
Merge branch 'master' of https://github.com/ryanoolala/Project-Re-Bro

Conflicts:
	app/scripts/app.js