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
#164 Added timestamps to story, then searched by them
Merge pull request #181 from klindenbach/master

#164 Added timestamps to story, then searched by them
Searching works
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into searchBranch
Searching and random story now work with ES. Just need to extend to work with locally stored data.