Renamed and moved files.
Merge branch 'master' of https://github.com/h4w5/hogwarts

Conflicts:
	app/controllers/students_controller.rb