added comment to app.js
Merge branch 'master' of https://github.com/bobdetemple/test-repot

Conflicts:
	app.js
Merge with remote repo
fixed merge issue, and added second comment