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

Conflicts:
	movies.txt
Merge branches 'master' and 'Egill'
Merge branch 'master' of github.com:LeNoobs/GitExerciseInClass
Merge branches 'master' and 'Egill' into Egill