Testing.
Merge branch 'master' of http://github.com/ash-c/pirategame

Conflicts:
	bin/pirategame.exe
Created new jump/move/stopmove functions for the playable character, so keyboard/controller inputs handled the same without duplicating code.