Merge pull request #3 from mattgmarcus/PhotoBranch

Photo branch
Merge branch 'master' of https://github.com/mattgmarcus/DartCard into PhotoBranch