jhvhjcvhcgcgcbgc
Merge branch 'origin/master'

Conflicts:
	Main.py
a
Merged format and accuracy under new class processing/ changed references to such classes
Merge branch 'origin/Manu'

Conflicts:
	Main.py