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

Conflicts:
	README
	app/views/pages/home.html.erb
Merge branch 'master' of https://github.com/jdfdesign/gko_motoracing_stbarth_com

Conflicts:
	README
	app/views/pages/home.html.erb