Gamepadstuffs
Merge branch 'master' of github.com:chubas/nebula

Conflicts:
	lib/game/main.js