Commit app.js

Commit app.js
Debugging
Merge branch 'master' into gh-pages

Conflicts:
	js/app.js