updated and added haiku (ノ・∀・)ノ
Merge branch 'develop'