Minor edits
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/me/johnnywoof/AOCommand.java