jsonの整形エラーを修正
Merge branch '2014winter_shima_copy'
Merge branch '2014winter_shima_copy'
Merge branch '2014winter_shima_copy' of https://github.com/chrolis/dakimakura_memo into 2014winter_shima_copy
おにきんのリンクを修正