[WIP] Some stuff before branching
Input for linux controllers and a track list
Add Violet Sprite
Some bug fixes

- megaman loses charge on being hit
- megaman can jump in the pinch (just not as well)
- some other stuff ^o^//
Added death line to world (screen height)

Conflicts:
	NEXTSTEPS.md
Merge pull request #32 from variousauthors/violetadd

Add Violet Sprite
fixed the bad reference
Merge branch 'master' of github.com-variousauthors:variousauthors/monstermash-jam-2014
Merging and some bug fixes
Lowered the shocked duration
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