testing merge
Merge branch 'master' of https://github.com/GolfOutingLive/GolfOutingLive

Conflicts:
	web/js/script.js