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

Conflicts:
	resources/README.txt