just a commit...
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/coffeetest.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
dabei die navigation zu implementieren