modif
Merge remote-tracking branch 'origin/master'

Conflicts:
	game_func.py
Merge branch 'master' of https://github.com/shideneyu/HeartRunes

Conflicts:
	game_func.py
	player.py
Merge branch 'master' of https://github.com/shideneyu/HeartRunes

Conflicts:
	game_func.py