updated my local files to what I found on the server (includes changes Dan made)
Merge branch 'master' into production
made commits dan requested in an email
removed thumbs.db files