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

Conflicts:
Gemfile
Gemfile.lock
bump