no message
Merge branch 'master' of https://github.com/magicride/fieldmaps

Conflicts:
	src/web/index.html
Added shots and fouls.