social btn
commit for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/home.css.scss
merge