Shapes work
Merge branch 'master' of https://github.com/D6Digital/SWENGFrame.git
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.