Incorporate use of REMs
Fix theme_location menu config value
Add footer menu and widget area
Stop tracking compiled css and css map files
Merge branch 'master' of github.com:hotelluxe/wptheme

Conflicts:
	style.css
	style.css.map
Merge pull request #14 from ProjectFrank/master

Add footer menu and widget areas