add links to photos and show page, add link to navbar to add new photo
fix merge conflicts in log
Merge pull request #10 from georgexzeng/george-john

George john