fixed syntax, not run yet
Merge branch 'master' of github.com:NotSoNinja/johnathan-c-class