teeny comment adds
added really important comment
Merge branch 'master' into phillis

Conflicts:
	app.js
	static/clientApp.js