Second commit (Test)
Third commit (test)
Cleaned up junk files
Rearranged UML folder and added UML diagrams and files.
General commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/LeonIRL/Team05_CYOA.git
Merge branch 'master' of https://github.com/LeonIRL/Team05_CYOA