Added basic class, switch to main class
Revert "Added basic class, switch to main class"

This reverts commit 48d9d3ecdc0fee4e94aae273fc63851a65eba093.
Changed variables to names that make sense
Changed var names
Merge remote-tracking branch 'origin/Alex-GUI'
metadatacommit
comit
a
Merge branch 'master' of https://github.com/kmacdon1/COMP-3415-ResidenceProject

Conflicts:
	src/residence/GUI.java
Made happy version of GUI. Variables are labelled, still needs
comments/functions for various buttons.
Device Constructors
add high-priority task into TODO link