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

Conflicts:
Gemfile
Gemfile.lock
app/views/application/_header.html.erb
app/views/pages/_page.html.erb
app/views/pages/contact.html.erb
app/views/pages/home.html.erb
app/views/pages/one_page.html.erb
bump