design work
Lots o changes
forgot 1
Alot again
lots of stuff
quiz mode
lots of stuff! HAHAH COLIN
Adding database changes to new master LOTS OF STUFFS
changing flash activity
Added increment stats methods
forgot 1
Got Multi to works correctly
fix properties
fix the properties
fix imports
Merge remote-tracking branch 'origin/colin4' into master2

Conflicts:
	Bonsai/project.properties
	Bonsai/src/org/bonsai/activities/MultiChoiceActivity.java
Removing testing driver
creating cards with ids now
fixed loading initial database
fake answers
deleteCard