Edit UML (some)
Merge branch 'master' of https://github.com/BusakornS/CSC319_Project