changes stylesheets
Merge branch 'master' into production

changes stylesheets

Conflicts:
	app/assets/stylesheets/bootstrap_overrides.css.scss
	app/views/layouts/application.html.erb
fixes merge
fixes merge conflict
changes header size
makes house box clickable
fixes typo
Merge pull request #11 from bcutrell/production

Production