Merge branch 'master' of https://github.com/senghuot/Sandbox

Conflicts:
	views/default.ejs
Merge branch 'master' of https://github.com/senghuot/Sandbox