simplefied 3opt again
Merge branch 'master' of github.com:calledol/project1_avalg14