got db working!!! mostly
latest version
Added failed test for model
merging
adding getFragment, not tested yet, may have bugs,
Merge branch 'testbranch'

Conflicts:
	Adventure_app/bin/Adventure_app.apk
	Adventure_app/bin/classes.dex
	Adventure_app/bin/classes/com/uofa/adventure_app/activity/BrowserActivity.class
	Adventure_app/bin/resources.ap_
	Adventure_app/src/com/uofa/adventure_app/controller/LocalStorageController.java
fixing deleted files