added gitignore
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
this is a message
Merge branch 'master' of https://github.com/LeNoobs/GitExerciseInClass
Commit by Bjarni, added one movie (Pocahontas II).
Merge branch 'bjarni'

Conflicts:
	movies.txt
bjarni added lotr to list.
Merge branch 'bjarni'

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

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

Conflicts:
	movies.txt
Merge branch 'Egill'

Conflicts:
	.gitignore
	movies.txt
Merge branches 'master' and 'Egill' into Egill