ekki taka mark á þessu
conflict

Conflicts:
	test1.pro.user
rugl

Conflicts:
	test1.pro.user
Merge branch 'master' of https://github.com/steinarmh14/test1