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

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

Conflicts:
	movies.txt
blabla
Merge branch 'master' of github.com:ANewHope/GitExerciseInClass
hæ
breytingar
how to train
added movie
resolved conflict
Merge branch 'master' of github.com:ANewHope/GitExerciseInClass
scream
Merge branch 'halldis'
Merge branch 'master-hallgrimurt13'
breytingar
Merge branch 'master-aron'

Conflicts:
	movies.txt
Merge branch 'master' of github.com:ANewHope/GitExerciseInClass
ruglid
?
rugl