Added Cached: in front of any story which is saved locally
#135-Fixed Added Cached infront of localy stored stories
#136 Half working functionality of cache and upload - currently stackoverflow GSon errors
#136 **Incomplete - STACKOVERFLOWERROR when calling ESHandler Update, and with DBHandler add new story
#135-Added Cached before Local Story
Merge branch 'master' of https://github.com/tbendubois/301project
moving files over
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Taking photos and displayin them in viewPageActivity works
Merge pull request #180 from moorej12/master

#165, #26 Can take new photos
Merge pull request #181 from klindenbach/master

#164 Added timestamps to story, then searched by them
Fighting Fragments Update #1
Fighting Update #2
Fighting Update #3
Fighting Updaet #4
Completed Fighting (Update #5)
Fixed logic for caching, still not working
Fighting Patches (Update 6)
UI Mockups Updated
Random Choices