needs to have functioning if test on adding controller listeners (nothing added)
Merge branch 'xbox-controller' of github.com:Kyrremann/snakes-in-space into xbox-controller

Conflicts:
	snake-in-space/src/no/minimon/snakeinspace/MenuScreen.java