Worked on controllers
Merged conflicts
Parse error fixed
Added user login
Added user login