RequireJS
Conflict in Client
Merge branch 'master' of https://github.com/sKaNoN/IntTeMiniprojekt2.git

Conflicts:
	public/init.js