structs were wierd so I switched to classes
Merge branch 'master' of https://github.com/Neolitheon/421-Project-1