Beginning of Week 2
Updated through first half of week 2
Merge branch 'mod3'

Conflicts:
	app/controllers/pages_controller.rb
	app/controllers/sessions_controller.rb