bla
Merge branch 'master' of https://github.com/gabz0r/Projektmanagement

Conflicts:
	js/homeFunctions.js