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