Made photo map activity
Fixing git
Merge pull request #1 from mattgmarcus/PhotoBranch

Photo branch