Wat andere trucje
Merge branch 'master' of https://github.com/remcovdh/hackathon

Conflicts:
	views/customerDetail.jade
Merge branch 'master' of https://github.com/remcovdh/hackathon