removed swap files
removed foo.js
added blurb on main page
Merge remote branch 'origin/master' into brian

Conflicts:
	.app.js.swp
	static/.ClientProject.js.swp