update
Merge branch 'dev' of github.com:rstane/playcast into design

Conflicts:
	app/views/plans/index.html.erb
	app/views/users/show.html.erb
update
Merge branch 'dev' of github.com:rstane/playcast into design
update
update
Merge branch 'dev' of github.com:rstane/playcast into design
Merge branch 'dev' of github.com:rstane/playcast into design
Merge branch 'dev' of github.com:rstane/playcast into design
update
Merge branch 'dev' of github.com:rstane/playcast into design
未ログインルート修正
update
Merge branch 'design'
Merge branch 'dev'

Conflicts:
	app/models/plan.rb
ルート設定
不要ファイル削除
空行削除
update
update