Removed static declarations (compile error)
Merge branch 'master' of https://github.com/ErroneousPromulgation/Project2