Changed from isSepeical, to ENUMs
Merge branch 'master' of https://github.com/zohelfer/CS414v1