edda breytti mynd
BREYTTI OLLUgit add movies.txt git add movies.txt
Merge branch 'master' of github.com:Stodid/GitExcerciseInClass
Eg er ad breyta kv. edda
Merge branch 'master' of github.com:Stodid/GitExcerciseInClass

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Stodid/GitExcerciseInClass

Conflicts:
	movies.txt
Merge branch 'master' of github.com:Stodid/GitExcerciseInClass
edda