commit some stuff
fix errors, events all workgit add .
Merge remote-tracking branch 'origin/testnop2p' into testnop2p

Conflicts:
	doc/Master AbilityCard List
	src/project/lima/Player.java