created sessions controller and model
resolved merge conflicts