Merge pull request #15 from derrickoswald/master

First Thing Maker page ready for integration... I think.