changes to photogridfragment
resolved conflicts
more merge conflicts
fiddling around
Merge branch 'master' of https://github.com/mattgmarcus/DartCard into PhotoBranch
merged rob's stuff into mine
message verification, photogrid changes, finsihactivity
Merge branch 'master' of https://github.com/mattgmarcus/DartCard into PhotoBranch
deleted unneeded files
Merge pull request #6 from mattgmarcus/PhotoBranch

Photo branch