Reconstruct the structure to make it easy to transfer
Merge branch 'master' of
https://github.com/ChaoHou/Swen222-Group-Project

Conflicts:
	Group-project/src/Main.java
Update to use the new UI