foo bar
	modified:   _config.yml
	modified:   _includes/JB/sharing
	new file:   _includes/JB/sharing-providers/facebook
	new file:   _includes/JB/sharing-providers/global
	new file:   _includes/JB/sharing-providers/googleplus
	new file:   _includes/JB/sharing-providers/hn
	new file:   _includes/JB/sharing-providers/linkedin
	new file:   _includes/JB/sharing-providers/twitter
	modified:   _includes/themes/twitter/post.html

Conflicts:

	_config.yml