changed ALLES!
Merge remote-tracking branch 'origin/master'

Conflicts:
	assignment1/application/res/data.json