profile mostly completed
Merge branch 'master' of https://github.com/emoore24/connecttour

Conflicts:
	app.js