change classes and desktop docs
Merge branch 'dev' into avatar_BEM_classes

Conflicts:
	_site/assets/css/sassquatch.css
	_site/assets/css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch.css
	jekyll_docs/assets/css/sassquatch_mobile.css
update classes in docs
Merge branch 'dev' into avatar_BEM_classes
recompile
Merge branch 'dev' into avatar_BEM_classes

Conflicts:
	_site/assets/css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch_mobile.css
fix padding in content containers
Merge branch 'dev' into container_padding_153
Merge branch 'dev' into avatar_BEM_classes
update class names
use avatar base class
fix mobile.html assets path
Merge branch 'dev' of github.com:meetup/sassquatch into dev
separate out avatar--chapter
compile 4 conflict res
Merge pull request #171 from meetup/avatar_BEM_classes

use BEM naming convention for avatar component
Merge branch 'dev' into container_padding_153

Conflicts:
	_site/assets/css/sassquatch.css
	_site/assets/css/sassquatch_mobile.css
	jekyll_docs/assets/css/sassquatch.css
	jekyll_docs/assets/css/sassquatch_mobile.css
Merge pull request #177 from meetup/container_padding_153

Container padding 153
more explicit linkify selector, compile conflict res