some sort of changes
Merge branch 'master' of https://github.com/QxQ/j-and-s

Conflicts:
	bin/player.pyc
	bin/pygame_helper/__init__.pyc
	bin/pygame_helper/pygame_events.pyc
	bin/pygame_helper/pygame_obj.pyc
Merge branch 'master' of https://github.com/QxQ/j-and-s

Conflicts:
	bin/pygame_helper/__init__.pyc
	bin/pygame_helper/pygame_events.pyc
	bin/pygame_helper/pygame_obj.pyc