indentation
Merge branch 'courses' of github.com:grahamcracker/grapefruit into courses
Merge branch 'courses' of github.com:grahamcracker/grapefruit into courses
Merge branch 'courses' of github.com:grahamcracker/grapefruit into courses

Conflicts:
	app/views/devise/registrations/new.html.erb
Merge branch 'courses' of github.com:grahamcracker/grapefruit into courses
Merge branch 'courses' of github.com:grahamcracker/grapefruit into courses
Large commit fixing associations and allowing students to join courses