Fixed #60
Fixed #62
Merge remote-tracking branch 'kirderf1/master'

Conflicts:
	src/com/mraof/minestuck/editmode/ClientEditHandler.java