Änderung von Daniil
Merge branch 'master' of github.com:bfh/passerelle-informatik-2014

Conflicts:
	project_overview_Dan_Mahmoud_Ben.html
Merge branch 'master' of github.com:bfh/passerelle-informatik-2014