running

run
Merge branch 'master' of https://github.com/MissionBit/megaman-the-wrath-of-fludd

Conflicts:
	megaman.js
lot of shit we needed to to

shave a ack