setti inn nafnid mitt
Merge branch 'master' of github.com:hogniR/testFunAwesomex
fixed conflickt
Conflicts:
	test.txt