Captain America 2, much good. Very strong captain. Very man.
Merge branch 'master' of github.com:FimmFraeknu/GitExerciseInClass

Conflicts:
	movies.txt

It's 2, you... you.. :)