bjarni added lotr to list.
Merge branch 'bjarni'

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

Conflicts:
	movies.txt