working on class
merged conflict
Class almost done
Merge branch 'master' of https://github.com/lalalah/CompilersPS3-2