Vi testar om det fungerar
Merge remote-tracking branch 'origin/master'
Konfilkttest
Konflikttest igen
A
Merge branch 'origin/master'

Conflicts:
	WinterDreams/hello.cpp