Finish phases 1 and 2
Finish phase 3
"Finish through phase 5"
Merge branch 'master' of https://github.com/jessiedouglas/rails_lite

Conflicts:
	README.md
	skeleton/.rspec
	skeleton/Gemfile
	skeleton/Gemfile.lock
	skeleton/bin/p01_basic_server.rb
	skeleton/bin/p02_controller_server.rb
	skeleton/bin/p03_template_server.rb
	skeleton/bin/p04_session_server.rb
	skeleton/bin/p05_params_server.rb
	skeleton/bin/p06_router_server.rb
	skeleton/lib/phase2/controller_base.rb
	skeleton/lib/phase3/controller_base.rb
	skeleton/lib/phase4/controller_base.rb
	skeleton/lib/phase4/session.rb
	skeleton/lib/phase5/controller_base.rb
	skeleton/lib/phase5/params.rb
	skeleton/lib/phase6/controller_base.rb
	skeleton/lib/phase6/router.rb
	skeleton/spec/p02_controller_spec.rb
	skeleton/spec/p03_template_spec.rb
	skeleton/spec/p04_session_spec.rb
	skeleton/spec/p05_params_spec.rb
	skeleton/spec/p06_router_spec.rb
	skeleton/spec/p07_integration_spec.rb
	skeleton/views/cats_controller/index.html.erb
	skeleton/views/cats_controller/new.html.erb
	skeleton/views/my_controller/counting_show.html.erb
	skeleton/views/my_controller/show.html.erb
	solution/.rspec
	solution/Gemfile
	solution/Gemfile.lock
	solution/bin/p01_basic_server.rb
	solution/bin/p02_controller_server.rb
	solution/bin/p03_template_server.rb
	solution/bin/p04_session_server.rb
	solution/bin/p05_params_server.rb
	solution/bin/p06_router_server.rb
	solution/lib/phase2/controller_base.rb
	solution/lib/phase3/controller_base.rb
	solution/lib/phase4/controller_base.rb
	solution/lib/phase4/session.rb
	solution/lib/phase5/controller_base.rb
	solution/lib/phase5/params.rb
	solution/lib/phase6/controller_base.rb
	solution/lib/phase6/router.rb
	solution/spec/p02_controller_spec.rb
	solution/spec/p03_template_spec.rb
	solution/spec/p04_session_spec.rb
	solution/spec/p05_params_spec.rb
	solution/spec/p06_router_spec.rb
	solution/spec/p07_integration_spec.rb
	solution/views/cats_controller/index.html.erb
	solution/views/cats_controller/new.html.erb
	solution/views/my_controller/counting_show.html.erb
	solution/views/my_controller/show.html.erb
"Finished through phase 7"