Added third name
Added Espen
Merge branch 'feature-b'

Conflicts:
	hei