removed comments and added new ones
Merge branch 'gh-pages'

Conflicts:
	js/app.js