changes
Merge pull request #56 from kweek/master

design changes
I'm so fancy merge conflicts