Solved Merge Conflict, Fixed Issue #1#40

BraulioL wants to merge 5 commits intoChicoState:mainChicoState/CppMath:mainfrom

BraulioL:mainBraulioL/CppMath:mainCopy head branch name to clipboard