Merge branches 'version2' and 'temp' into version2
Merge branch 'version3' of https://github.com/wvu-irl/cataglyphis into version3
working on modifying approach mode to use enums to be more explicit