semi-finalized program
conflict resolution
resolving conflicts
Merge branch 'master' of https://github.com/Echiv/RaptorMath.git