Test merge
Merge branch 'master' of github.com:Dugong42/brique-gps

Conflicts:
	README.md