Merge pull request #13 from danaw/master

Add (non-functional) booking form
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
Use unminified jQuery 1.8.0 from Google CDN
Remove unnecessary loop
Remove unnecessary ipsum text
Stop watching js and php files for changes
Fix nav menu spacing
Center paragraph text in footer widget area
Style only booking form instead of all forms
Use @import for Google Font instead of link tag
Incorporate Frank's WordPress Gallery Slider
Merge branch 'master' of github.com:hotelluxe/wptheme
Merge pull request #15 from ProjectFrank/master

Incorporate gallery slider
Add front page thumbnails