editing editdeckActivity
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git

Conflicts:
	Bonsai/src/org/bonsai/activities/EditDeckActivity.java
Added change to fake answers
This is commiting the Bonsai properties file