weather wheel of death
merging with master
adding new gemlock
Merge branch 'master' into wheel-of-feelings
Merge pull request #36 from danisaurus/wheel-of-feelings

Wheel of feelings