nice
Merge branch 'master' of github.com:DasOrganization/GitExerciseInClass

Conflicts:
	movies.txt