edited out all the conflicts again
Merge branch 'master' of github.com:sashafklein/planit

Conflicts:
	app/models/plans/yaml/vanessa-and-colin-spain-morocco.yml
Merge branch 'master' of github.com:sashafklein/planit
Print page using new map directive