First md commit
Merge branch 'master' of https://github.com/mpguedes/maplink.git

Conflicts:
	README.md