working on users
added user to timeslots controller
finished merge
messy commit
working
associated timeslots with users