update
Merge branch 'master' of github.com:daraf-jp/tsubuyaki_18_oct

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