New Structure
Merge branch 'master' of https://github.com/ESpearman/COMP3350-Group-Project

Conflicts:
	src/main/java/Main.java