Fixes header sizing and adds menu to header
Merge branch 'master' of http://github.com/TheHeat/yfennimap

Conflicts:
	wp-content/themes/yfennimap/scss/_map.scss
	wp-content/themes/yfennimap/style.css