fixes conflicts
Merge branch 'master' of github.com:Codystringham/golfcrony

Conflicts:
	app/assets/stylesheets/sitewide.css.scss
	app/views/layouts/application.html.erb
Merge branch 'master' of github.com:Codystringham/golfcrony

Conflicts:
	app/assets/stylesheets/sitewide.css.scss
	app/views/layouts/application.html.erb