fleshing out the app and such
Merge branch 'master' into feauture/cookies

Conflicts:
	public/js/src/app.js