Testkod

Testkod
Merge pull request #5 from KristofferAo/master

Testkod
Merge pull request #4 from mbitar/master

ändra till hejjj hej
ost

osteliost
Merge pull request #6 from osteliost/master

ost
hej halla

hej
Merge pull request #7 from elertson/master

hej halla
Ändrade kul.txt
hej

hej
Merge pull request #9 from joelabr/master

Ändrade kul.txt
Merge remote-tracking branch 'upstream/master'

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

as
arrrr
Merge branch 'master' of https://github.com/CaF2/demo
tjabbba