stuff
Merge branch 'master' into artist-adjustments
more margin
drying css
Merge pull request #202 from Petercopter/artist-adjustments

Artist adjustments