Merge branch 'master' of https://github.com/tgoerblich/homeworkfour

Conflicts:
	app.js
	app.json
	index.html
	resources/css/app.css
jetzt vom production ordner aus