moar cleanup!
Merge branch 'dumbclient_changes' of github.com:t2munika/cs454 into dumbclient_changes