Finished with class
Merge branch 'master' of https://github.com/Deathnerd/CSC191