updated user stuff, added availability stuff
updated user stuff

-changed the user stuff to extend alex's classes
-fixed some merge conflicts
-added availability stuff
-still have a few things left to do for availability