event home stub example page
more of event page example
merge master
more example page
kill stupid button
add talk
fix rakefile
recompile
Merge branch 'master' into whitney_specimen
Merge branch 'doc_page_examples' into whitney_specimen

Conflicts:
	_site/assets/css/sassquatch.css
	_site/assets/css/sassquatch_mobile.css
	_site/index.html
	css/sassquatch.css
	css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch.css
	jekyll_docs/assets/css/sassquatch_mobile.css
specimen with whitney
some more crap
some more crap
add font to styleguide docs
Merge branch 'release_1.5.0' into whitney_specimen

Conflicts:
	_site/assets/css/sassquatch.css
	_site/assets/css/sassquatch_mobile.css
	_site/assets/css/sassquatch_tests.css
	css/sassquatch.css
	css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch.css
	jekyll_docs/assets/css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch_tests.css
whitney script
GIVE WHITNEY PERMISSION
Merge branch 'release_1.5.0' into whitney_specimen

Conflicts:
	_site/assets/css/sassquatch.css
	_site/assets/css/sassquatch_mobile.css
	_site/assets/css/sassquatch_tests.css
	css/sassquatch.css
	css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch.css
	jekyll_docs/assets/css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch_tests.css
unconflicted statics and docs
rebuild all the things