#52, added method to UserController and generated the view
#52, File editing
#52, Finished user story
Added UML
Added brief documentation
#52, Edited documentation
#52, Edited documentation again
Merged Menna's branch with my branch
#52, minor editings for the code to work correctly
#52, Edited code for reviewing
#52, Edited UML
Edited code for reviewing again
#52, Edited code for verification
#52, Edited the code as advised
#52, Final code for code reviewing
#52, Edited UML
#52, merged with Menna again
#52,Final version of UML
#52, Ready for scenario reviewing
Issue#39 fixed rest of conflicts