added map
added directions link
merging
reverting merge
reverting merge
Revert "added directions link"

This reverts commit ac1a2ad7be1168caa64e1bf38f3b7e01a078b4ac.

Conflicts:
	tmp/js/app.js
fixing conflicts with side nav
merging property.scss