committadi
Merge branch 'master' of github.com:Thotulidid/GitExerciseInClass

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