Moved Player actions to methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	Battle.py