conflict fixes
Merge branch 'master' of https://github.com/Eiiki/megaman
Merge branch 'master' of https://github.com/Eiiki/megaman
positioned goodies