Removed Titanic and added Inception
Merge branch 'master' of github.com:AADOJ/spawncamping-octo-nemesis

Conflicts:
	Movies.txt
Merge branch 'master' of github.com:AADOJ/spawncamping-octo-nemesis
added fart machine witin a new branch
resolved merge
Resolved some conflicts

Conflicts:
	Movies.txt
Veit ekkert hvað eg er að gera
Added ma branch and fixed merge conflicts
A að commenta eitthvað
Merge branch 'master' of github.com:AADOJ/spawncamping-octo-nemesis