hej

hej
Merge remote-tracking branch 'upstream/master'

Conflicts:
	kul.txt
LOL
Merge pull request #10 from KristofferAo/master

as