ignore method
Merge branch 'master' into cleancontroller

Conflicts:
	app/controllers/users_controller.rb
changes
Merge branch 'cleancontroller' into mergetest

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_student.html.erb
remove stuff
remove other stuff
Merge branch 'mergetest'