Manually merged changes from my personal branch with the current version of master branch. Git could not resolve conflicts autonomously.
Adde jpg files for class diagram and use case diagram. Added these figures to .tex as well.