added name to hei
Merge branch 'feature-b' master entry and appended second name

Conflicts:
	hei
Added Espen