merge
Merge branch 'master' of http://github.com/kai23/pastamanga
merge + anime