init commit
Merge branch 'master' into socket09_versuch

Conflicts:
	app.js
updateCount fixed

mm works
Merge branch 'socket09_versuch'