Added gems
Merge branch 'master' into tests
Prep testing
Show tests for capsules done, and some factories done
Changed to requests specs, made specs match new expect() syntax
Minor code cleanup
spacing
Merge branch 'master' into tests

Conflicts:
	.DS_Store
	app/.DS_Store
	app/controllers/guest_controller.rb
	app/views/courses/new.html.erb
Schema
Merge branch 'master' into tests
Merge branch 'master' into tests
Merge branch 'tests'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/views/capsules/new.html.erb