getters r for bads
Merge branch 'master' into player_gen

Conflicts:
	main.py