quick pre-merge commit
Merge branch 'master' of https://github.com/bsanders/softeng
pre-merge commit with additional photo-listing functionality
Merge branch 'master' of https://github.com/bsanders/softeng