* Todo stuff
Merge branch 'diversity' of github.com:Dacilndak/eventreg
* MERGESS

Conflicts:
	app/controllers/user_controller.rb
	app/models/student.rb
	app/views/user/login.html.erb
	app/views/user/register.html.erb
Merge branch 'diversity' of stratosphe.re:eventreg
Merge branch 'diversity' of github.com:Dacilndak/eventreg
* SO MANY DAMN MERGES

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	app/views/user/register.html.erb
Merge branch 'master' of github.com:Dacilndak/eventreg
* Vindicator changes, as well as updates