-
Merge branch 'master' of https://github.com/mpguedes/maplink

Conflicts:
	README.md