am i committing to my branch ?
ble
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass

Conflicts:
	movies.txt