Update app.js
Merge branch 'master' of https://github.com/KirbyKaylor/SLUrater

Conflicts:
	app.js