renamed pupil to student - doesn't work...
Merge branch 'rename_pupil'

Conflicts:
	app/controllers/session_controller.rb
	db/seeds.rb