better
Merge branch 'master' of https://github.com/salteadorneo/camposrugby

Conflicts:
	www/campos.txt
	www/js/main.js