20140521marge
Merge branch 'master' of https://github.com/nullzine/Komono