p
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub

Conflicts:
	resources/README.txt
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub

Conflicts:
	resources/README.txt
gg
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub

Conflicts:
	resources/README.txt
Updated Disc Golf courses
Updated disc golf courses
Merge branch 'master' of https://github.com/techkilljoy/PagosaDiskGolfClub

Conflicts:
	resources/README.txt