bigsnakey ready
Merge branch 'master' of https://github.com/Eiiki/megaman
some fuckup...