updated the user_controller and user homepage
Fixed config conflict
Changed the user controller
conflicts resolved
user homepage working
Merge pull request #4 from BooneTeam/user_homepage

User homepage