moving files over
Merge pull request #165 from jcadek/master

PhotoTile's and choosing Photo's from gallery
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
Fighting Fragments Update #1