yay i did the photo stuff and added rob's stuff
merge conflicts
removed strings, modified photoviewactivity
Merge pull request #2 from mattgmarcus/PhotoBranch

Photo branch