map
Merge branch 'master' of https://github.com/elbalu/sharehands

Conflicts:
	public/templates/posts/map.dust