Testing
Changing Card Object, and adding a CardDeck class
git ignore
Merge remote-tracking branch 'origin/master'
Initial Database Help
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Options and testing driver
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge branch 'master' into colin
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge remote-tracking branch 'github/master'
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai

Conflicts:
	Bonsai/gen/org/srge/bonsai/R.java
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai
Many more changes to the options menu, added select deck screen
Finished Review Mode
made the flash card mode dynamic
Too much work