Well, this crap won't leave no matter how many times I do a hard reset.
Merge remote-tracking branch 'origin/Computers'

Conflicts:
	src/co/sblock/Sblock/Chat/Chester/ChesterListener.java
	src/co/sblock/Sblock/Chat/ColorDef.java
	src/co/sblock/Sblock/CustomCommand.java
	src/co/sblock/Sblock/Database/Call.java
	src/co/sblock/Sblock/Database/Machines.java
	src/co/sblock/Sblock/Events/Listeners/BlockBreakListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockFadeListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockGrowListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockIgniteListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockPhysicsListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockPistonExtendListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockPistonRetractListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockPlaceListener.java
	src/co/sblock/Sblock/Events/Listeners/BlockSpreadListener.java
	src/co/sblock/Sblock/Events/Listeners/EntityDamageByEntityListener.java
	src/co/sblock/Sblock/Events/Listeners/EntityDamageListener.java
	src/co/sblock/Sblock/Events/Listeners/EntityExplodeListener.java
	src/co/sblock/Sblock/Events/Listeners/EntityRegainHealthListener.java
	src/co/sblock/Sblock/Events/Listeners/FoodLevelChangeListener.java
	src/co/sblock/Sblock/Events/Listeners/FurnaceBurnListener.java
	src/co/sblock/Sblock/Events/Listeners/FurnaceSmeltListener.java
	src/co/sblock/Sblock/Events/Listeners/InventoryClickListener.java
	src/co/sblock/Sblock/Events/Listeners/InventoryCloseListener.java
	src/co/sblock/Sblock/Events/Listeners/InventoryDragListener.java
	src/co/sblock/Sblock/Events/Listeners/InventoryMoveItemListener.java
	src/co/sblock/Sblock/Events/Listeners/InventoryOpenListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerAsyncChatListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerChangedWorldListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerCommandPreprocessListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerDeathListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerDropItemListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerEditBookListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerInteractEntityListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerInteractListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerItemHeldListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerJoinListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerLoginListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerPickupItemListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerQuitListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerTeleportListener.java
	src/co/sblock/Sblock/Events/Listeners/ServerListPingListener.java
	src/co/sblock/Sblock/Events/Listeners/SignChangeListener.java
	src/co/sblock/Sblock/Events/Listeners/VehicleBlockCollisionListener.java
	src/co/sblock/Sblock/Events/Packets/WrapperPlayServerCustomPayload.java
	src/co/sblock/Sblock/Events/Packets/WrapperPlayServerOpenWindow.java
	src/co/sblock/Sblock/Machines/MachineInventoryTracker.java
	src/co/sblock/Sblock/Machines/SblockMachines.java
	src/co/sblock/Sblock/Machines/Type/Alchemiter.java
	src/co/sblock/Sblock/Machines/Type/Bank.java
	src/co/sblock/Sblock/Machines/Type/Cruxtender.java
	src/co/sblock/Sblock/Machines/Type/Machine.java
	src/co/sblock/Sblock/Machines/Type/TotemLathe.java
	src/co/sblock/Sblock/Machines/Type/Transmaterializer.java
	src/co/sblock/Sblock/SblockEffects/ActiveEffect.java
	src/co/sblock/Sblock/SblockEffects/ActiveEffectType.java
	src/co/sblock/Sblock/SblockEffects/PassiveEffect.java
	src/co/sblock/Sblock/Utilities/Captcha/CruxiteDowel.java
	src/co/sblock/Sblock/Utilities/Economy/EconomyBank.java
	src/co/sblock/Sblock/Utilities/Inventory/InventoryUtils.java
	src/co/sblock/Sblock/Utilities/RawMessages/MessageClick.java
	src/co/sblock/Sblock/Utilities/RawMessages/MessageElement.java
	src/co/sblock/Sblock/Utilities/RawMessages/MessageHalement.java
	src/co/sblock/Sblock/Utilities/RawMessages/MessageHover.java
	src/co/sblock/Sblock/Utilities/RawMessages/RawAnnouncer.java
	src/co/sblock/Sblock/Utilities/Regex/RegexUtils.java
	src/co/sblock/Sblock/Utilities/Server/ServerMode.java
	src/co/sblock/Sblock/Utilities/Spectator/Spectators.java
	src/co/sblock/Sblock/Utilities/Vote/SleepVote.java
Merge remote-tracking branch 'origin/master' into Computers