Comment out some definitions. Classes aren't implemented yet.
Merge branch 'master' of https://github.com/EchoSource/cmpsc221-final.git