Wanted! insted of The Good, the Bad and the Ugly
Merge branch 'master' of github.com:GeitIBandi/GitExerciseInClass

Conflicts:
	movies.txt
Merge branch 'master' of github.com:GeitIBandi/GitExerciseInClass