Colinear handling
Merge branch 'master' of github.com:regehr/solid_code_class