Minor fixes
Photo stuff
Clearing up some extra files
Merge pull request #50 from rocketfish/newNewBranch

Photo display