Minor changes
Merge branch 'master' of github.com:Erkimoddarar/GitExerciseInClass

Conflicts:
	movies.txt