masthead complete
Merge branch 'master' of https://github.com/Lynup-Agency/baja-properties

Conflicts:
	css/styles.css.map
	css/styles.min.css