added essential movies to list. No child can be happy without them.
Added SW EP5
Moar movies!
added comment about star wars
Merge branch 'master' of https://github.com/TeamOrvar/DasGit

Conflicts:
	movies.txt
fixed conflict
Everybody needs to comment when they commit
Merge branch 'master' of https://github.com/TeamOrvar/DasGit

Conflicts:
	movies.txt
koma svo conflicT!!!!
ma svo!
removed breyting
hlytur ad koma conflict nuna!
go
Bætti við DIE HARD
Merge branch 'master' of github.com:TeamOrvar/DasGit
Merge branch 'master' of https://github.com/TeamOrvar/DasGit

Conflicts:
	movies.txt
Fucked it up
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/TeamOrvar/DasGit
Merge branch 'master' of github.com:TeamOrvar/DasGit