Óla breyting
Merge branch 'master' of github.com:LeChamp/GitEx
Resolved !!!!
Conflicts:
	moviess.txt