Evaluator implemented, need to be deeply tester
Merge branch 'master' of github.com:scorthes/CSProject