Merge branch 'master' of https://github.com/tourismwhistler/2014

Conflicts:
	css/main.css
	css/styleguide.css