Updated the steps file
[WIP] Part way through adding bullet collision
Merge branch 'master' into x_buster
Merge branch 'master' into bullet_collision

Conflicts:
	NEXTSTEPS.md
Some bug fixes

- megaman loses charge on being hit
- megaman can jump in the pinch (just not as well)
- some other stuff ^o^//
Added collision to bullets and bullet limits in arm cannon
All charge and pellet ammo is handled in cannon

- The arm cannon tracks the integer count of ammo (this is better)
- charge shots are limited too
Added death line to world (screen height)
Merge branch 'master' into bullet_collision
[WIP] Some stuff before branching
Merge branch 'master' into bullet_collision

Conflicts:
	NEXTSTEPS.md
	game.lua
	player_movement.lua
Moved the bullet creation into the arm cannon

Now there is no time when bullets are incremented but
not decremented. This does not solve the bullet drop Clang
experienced.
updated the steps file
Resolved some ambiguities found while button mashing
Stopped the crash

Bullet collision code was looping forever.
Resolved the replay that demonstrated lost shots
[WIP] basic smoke trail a go-go
adjusted Dash and climb smoke offsets and frequencies
Added the placeholder dash sparks decoration
[WIP] z order sorting for world registered entities