A little tsuntsun.
Merge branch 'dev' of https://github.com/bmallin/baka-chan into dev