added key press event
Merge remote-tracking branch 'origin/master'

Conflicts:
	slinx2/loadObj.cpp
	slinx2/player.cpp