This works
Some last changes...
Merge branch 'master' into Alpha_0.1

Conflicts:
	app.js
	views/index.ejs