hej meddelande
Merge branch 'master' of https://github.com/Hedlundaren/Komaprojekt

Conflicts:
	jakoppi.txt