changed: music.JSON, film.JSON, fav.js, task 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	Meilenstein3/json/film.JSON