・タイトル変更
Merge remote-tracking branch 'origin/master'

Conflicts:
	archive.html
	atom.xml
	index.html
	programming/2014-05-17/inflexible-rspec/index.html
	programming/2014-05-26/my-posi_tip1/index.html
	project/2014-06-06/tweetwatch_server/index.html
	project/2014-08-05/tictactoe/index.html
	rss.xml