Implemented users and sessions controller and changed the schema
Resolved merge conflicts