final commit
Fixed everything, finaly commit
Merge branch 'master' of https://github.com/PavelKondratyev/StuyCraft

Conflicts:
	StuyCraft.java