refactored geometry/mixer enums to uppercase names
solved merge conflict
Merge branch 'master' of https://github.com/Fingerpaint/project-code
refactored file name, aka delete according to git