t
Fixed spelling
dsds
Merge branch 'hotfixes'

Conflicts:
	MainClass.java

Merged