chmod app.js to 777
update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/pages/login.jade
update config