foo
foo
Merge branch 'master' of github.com:mardraze/busstopdiscovery

Conflicts:
	README.md