added rick plan
Merge branch 'master' of github.com:justinmlynch/jls10

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/assets/stylesheets/pricing.css.scss
	app/views/devise/registrations/new.html.haml
	app/views/home/index.html.haml
	app/views/layouts/application.html.haml
	vendor/assets/stylesheets/normalize.css