ainakain miljoona confliktia

nyt nukkumaan
Merge pull request #7 from eemihauk/master

nonniin koitetaas taas
MERGE or sumthing
WTF is this git thing....
shotgunpickup