first
Update Player.java

Add removeCardFromBoard method that takes a Card argument
Update Player.java
more added
Merge branch 'testnop2p' of https://github.com/esun9064/Project-Lima into testnop2p
Update Player.java

Find cards by reference to remove them.
commit some stuff
Update Master AbilityCard List
fix errors, events all workgit add .
Merge remote-tracking branch 'origin/testnop2p' into testnop2p

Conflicts:
	doc/Master AbilityCard List
	src/project/lima/Player.java
finish up work in branch
fix conflicts
fix more conflicts