resolving conflict
Merge branch 'master' of https://github.com/Echiv/RaptorMath.git