Extra
Merge https://github.com/remcovdh/hackathon

Conflicts:
	controllers/home.js