updated app.js
"updated app.js"Merge branch 'master' of https://github.com/glenwks/genshyft

Conflicts:
	app/assets/js/app.js