update
update
update
update
update
update
Merge branch 'design'

Conflicts:
	app/views/plans/index.html.erb
	app/views/plans/show.html.erb