marin' trouble
Merge branch 'master' of https://github.com/Henrikjm/Sanntid

Conflicts:
	src/henriktest/henriktest.go