added a margin
bla
fixed conflicts and some bugs
Merge pull request #78 from AkramKahin/startfix

Startfix och så