Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' of github.com:RyuPiT/SharePla
Merge branch 'master' into copy_and_edit_plan
Modified:   config/routes.rb
Add plan_clone_path
Modified:   app/controllers/plan_controller.rb
Add clone method
Modified:   app/views/top/show.html.erb
Add clone button ( post object_id )
Merge branch 'copy_and_edit_plan_yota' into copy_and_edit_plan
Merge remote-tracking branch 'remotes/origin/copy_and_edit_plan' into copy_and_edit_plan
Modified:   app/controllers/plan_controller.rb
Set before_action to get plan from database
And render index.html
Modified:   app/views/plan/index.html.erb
Add "if" case of @plan is exist
Merge remote-tracking branch 'remotes/origin/copy_and_edit_plan' into copy_and_edit_plan
Merge remote-tracking branch 'origin/master' into merge_branch

Conflicts:
	app/views/plan/index.html.erb
Modified:   app/views/plan/index.html.erb
Auto indent
Merge branch 'merge_branch'