Merge remote-tracking branch 'origin/dave'
Merge branch 'master' of github.com:dhigginbotham/express-image-gallery-api