fixed non-static errors
Merge branch 'master' of https://github.com/sirajali05/ECE2524-Final-Project
more error fixing