added new funtionality to user routing
resolved conflict
adding logout functionality
resolve conflict
Merge pull request #24 from shidel-dev/user_routing

User routing