bætti við the Room
the room
Merge branch 'master' of https://github.com/ANewHope/GitExerciseInClass

Conflicts:
	movies.txt
Merge branch 'master' of https://github.com/ANewHope/GitExerciseInClass
the room

Conflicts:
	movies.txt