no message
Merge branch 'change_template_for_the_modal' of https://github.com/jemson/golf into change_template_for_the_modal

Conflicts:
	public/.tmp/css/main.css
added golf ball favicon
Merge branch 'gh-pages' into change_template_for_the_modal

Conflicts:
	public/.tmp/css/main.css
Merge branch 'gh-pages' into change_template_for_the_modal