Merge branches 'haresoccer' and 'master' of https://github.com/verlab/super_mario_soccer_base into haresoccer
New formation added: 4-3-3

Fixed a bug where players in the right were misplaced
New formation added: 4-3-3

Fixed a bug where players in the right were misplaced
resolving conflicts
Merge branches 'haresoccer' and 'master' of https://github.com/verlab/super_mario_soccer_base into haresoccer

Conflicts:
	run_team.py
	smsoccer/strategy/formation.py
New formation added: 4-3-3

Fixed a bug where players in the right were misplaced