CalculateEvaluation finish
Merge branch 'master' of
https://github.com/nomore001/WebIndyThaiTester.git

Conflicts:
	src/evaluation/EvaluationManager.java