edited
Merge branch 'master' of https://github.com/pgalyen87/Megaman