README.md
Merge branch 'master' of https://github.com/wooygcom/mapc.me

Conflicts:
	README.md