fixed bug with redundant lines
Updated UML Diagram.
merging with Jason
Merge branch 'master' of https://github.com/J-Fid/Senior-Design-I