created more models and views
removing shit
merge conflict fix
adding user session