more stuff
Merge branch 'develop' of https://github.com/tinyjing/Genesys-Hackathon

Conflicts:
	views/layout.jade