Merge branch 'master' into design
Merge branch 'master' into design
リフレッシュボタン設置
Merge branch 'master' of github.com:fukayatsu/transicon into design

Conflicts:
	app/views/pages/index.html.haml
Add link to refresh button
Merge pull request #17 from fukayatsu/design

リフレッシュボタン設置