error fixin
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/shit/minecraft/ShitMinecraft.java
navigation line is finitched.