Merge branch 'master' of https://github.com/jdfdesign/gko_juliegauthron_com

Conflicts:
Gemfile.lock
log/development.log.3
log/development.log.8
bump