minor changes of the layout
Merge commit '28f01545b7c28a07e56f4ad105dba434a6d5a04d'

* commit '28f01545b7c28a07e56f4ad105dba434a6d5a04d':
  Change type to utype
  Clean up navigation

Conflicts:
	app/views/layouts/_navigation.html.haml
check params empty or not in user controller
Merge commit '49d3f22e60bab2d05473a122d4efe55a31beeb57'

* commit '49d3f22e60bab2d05473a122d4efe55a31beeb57':
  Fix radio buttons
minor change on login page
Merge commit 'c32653909de2c0eb3f2f8155a031f13b20b5107e'

* commit 'c32653909de2c0eb3f2f8155a031f13b20b5107e':
  layouts for all entities
  Quick and dirty error fix
  Login stuff
  User can now change password
  Add Student Preferences
  Update annotations
  Link up Users to their models
make preference controller and views
please take a look at the _student.html.haml (student page), I'm not sure if this is good enough to show on the homepage of student
Add sponsor preference table, and view. The next step is to allow student to give preference and sponsor to give preference based on  student preferences. Do you have any idea of showing preference table on the page? (as every student may have multiple records in preference table)
Added pry
Add Google drive link to teams
Fixed merge conflicts with schema