fixed bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	ErrorEvaluation.py
Merge branch 'master' of https://github.com/turboNinja2/Software