Updated Enums up to Franks room
Merge pull request #229 from jcotrel/master

Updated Enums up to Franks room
Fixed Nina typo
Merge pull request #230 from jcotrel/master

Fixed Nina typo
Merge https://github.com/JohnMai/WhiteSharks