added attack
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/test_world.py
added attack
Merge remote-tracking branch 'origin/master'