Mapping game pad buttons into chip8 keypad
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vita8.userprefs