map.php

1.right address image
2.border bottom smaller
contact.php
Merge remote-tracking branch 'origin/tttt' into tttt

Conflicts:
	css/layout.css
	gallery.php
Merge branch 'tttt' of https://github.com/ecadigital/resort2 into tttt