added some classes
moved some stuff
Merge branch 'master' of https://github.com/MrSkyBear/CS340