create controllers
 fixing merge conflict
user login created
Merge branch 'master' of https://github.com/Answart/Twitter_App into user_routes

merge branch
removed enable sessions from the index.rb controller
Merge pull request #4 from Answart/user_routes

User routes