dagur added what will be one hell of a file
Merge branch 'master' of https://github.com/DROP-TABLES/GitExerciseInClass
can i haz confiltz
Merge branch 'master' of https://github.com/DROP-TABLES/GitExerciseInClass
Merge branch 'master' of https://github.com/DROP-TABLES/GitExerciseInClass

Conflicts:
	movies.txt
conflict please
hue hue hue
yo
yolo
spelling in errormaker
Merge branch 'master' of github.com:DROP-TABLES/GitExerciseInClass
Merge branch 'master' of github.com:DROP-TABLES/GitExerciseInClass