fixed issues with static methods/variables
Merge branch 'master' of github.com:tdegenko/CSC296Final