sletter alt
Merge branch 'master' of https://github.com/hermanferre/fellesprosjekt

Conflicts:
	faen
	hei
	test.txt