dad
Merge branch 'master' of https://github.com/marcojansen/NotFlix

Conflicts:
	NotFlix/src/model/Model.java