add test
Merge branch 'master' of https://github.com/CMPUT301F13T05/Team05_CYOA
testing
testing
testing
added camera view
added camera
fixed some problems, still some with the context menus though
testing
Adding LocalStorageController and DbHelper
Delete testfile.txt
Delete test
resolve conflicts
String based web loading
delete some bin files
add license
Adding methods to LocalStorageController
Added checking for connection in httpRequest, deleted extra files that are not needed.
Implemented StoryGrid, adapter for the grid view, needs to be fixed for a better look, but it functional
Renamed StoryGrid to StoryGridAdapter