<not a real commit update>
Merge branch 'master' of https://github.com/KitRedgrave/basedefense

Conflicts:
	BaseDefender.py