basic skeleton code
Merge branch 'master' into stashed

Conflicts:
	app/js/app.js
	views/index.ejs
	views/partials/includes.ejs