layer problem

layer problem
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Merge pull request #231 from JohnMai/anthonylim

Fix Convo.none enum issue