Added user module and implemented a basic login session. Still needs a little polish on some parts.
Fixed merge conflits