game
Merge branch 'master' of https://github.com/claudioharu/teste

Conflicts:
	game/castiga.jpg
	game/click_sound.mp3
	game/options.rpy
	game/options.rpy.bak
	game/screens.rpy
	game/screens.rpy.bak
	game/screens.rpyc
	game/teste_sound.mp3
game