Fixed merge errors

Conflicts:
	src/net/buycraft/commands/BuycraftCommand.java