DON'T OVERWRITE MY STUFF.

okay okay. delete button works... generally. so yeah.
Merge branch 'master' of https://github.com/ehennenfent/APCS_JNKE

Conflicts:
	Game/SemesterProject/ourGui2.java