fixed some issues.
redid changes.
fixed commented code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/residence/GUI.java