Facebookとtwitterに投稿する機能の追加
Merge remote-tracking branch 'origin/mod_article'

Conflicts:
	app/views/articles/index.html.haml