Added content, changed photo files so they display correctly
Merge remote-tracking branch 'origin/master'