Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/TeamOrvar/DasGit

Conflicts:
	movies.txt
Merge branch 'master' of https://github.com/TeamOrvar/DasGit
merge was totally necessary