added user login/logout/register in controller
Merge branch 'master' of https://github.com/TeamMagicCarpet/TeamProject
added new line