Commit by Bjarni, added one movie (Pocahontas II).
Merge branch 'bjarni'

Conflicts:
	movies.txt
am i committing to my branch ?
bjarni added lotr to list.
Merge branch 'bjarni'

Conflicts:
	movies.txt
Change by Tommi, 1 movie added
added to movies
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Merge branch 'master' of github.com:LeNoobs/GitExerciseInClass

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

Conflicts:
	movies.txt
ble
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass

Conflicts:
	movies.txt
k
bjarni added
this is a commit
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
added my favorite movie