"started user management"
Merge pull request #37 from ashwin31/site_front_end

"started user management"
fixed conflicts