Added health, skeleton of attacks
Merge remote-tracking branch 'origin/master'

Conflicts:
	Scorpion.py