Toy Story
Merge branch 'master-johannai13'

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Sykurpudarnir/GitExerciseInClass

Conflicts:
	movies.txt