Almost Done with GUI

Store hasn’t been implemented yet or the game won screen. Also minor
bugs
Merge branch 'master' of https://github.com/swb0015/CS321_Team1_Project

Conflicts:
	CPE321_Project/nbproject/private/private.properties
	CPE321_Project/nbproject/private/private.xml