test123
Merge branch 'master' of https://github.com/Patrick-Fieger/P3

Conflicts:
	app/app/view1/view1.html