quick fix
commit
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git

Conflicts:
	Bonsai/src/org/bonsai/activities/EditDeckActivity.java
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
working on edit decks
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git

Conflicts:
	Bonsai/src/org/bonsai/activities/EditDeckActivity.java

	I don't know why there are so many staged changed after a 1 change file
merge 0.o