first step
cleaned up
demo ready
site-ish
joke complete
Merge branch 'master' of https://github.com/StoneCypher/haacker_news