cleanup, cleanup, everybody everywhere!
conflict
Merge pull request #9 from megantaylor/gh-pages

cleanup, cleanup, everybody everywhere!