fixed conflicts with linewrap merge; clarified ccMult calculation
Merge branch 'master' of https://github.com/ryants/EstCC