Input functionality added for joystick.
Merge branch 'master' of github.com:superjoe30/spacefight

Conflicts:
	src/scene.cpp