Added GUI class
Merge branch 'master' of https://github.com/cra5370/swen262-project

Conflicts:
	nbproject/private/private.properties
Added DisplayState