mergining it haikus from the server
Merge branch 'master' of https://github.com/abelsonlive/haikugrams