Added Constants and Generics
Merge branch 'master' of https://github.com/ohearnk/CS467