added to movies
Added 2 more movies
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
k
bjarni added
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
added my favorite movie
changing bob the builder
branching
changing name
Merge branch 'master-blindu'

Conflicts:
	movies.txt
conflict
fixing conflict
conflict fix