user system should be mostly functional
Merge branch 'master' of github.com:tdegenko/CSC296Final