Merge branch 'master' of https://github.com/kaplusa/oaks

Conflicts:
	Hammer Files/assets/stylesheets/style.scss
Why The Oaks

Added Why The Oaks page, and started working on masonry.