Restore this branch to what it was
Merge remote-tracking branch 'origin/master' into KeirJames
Fixed all issues pointed out by @V10lator
Added SurgeServer and SurgeOfflinePlayer
Removed implements due to issues it could cause
Merge remote-tracking branch 'origin/master' into KeirJames
Merge remote-tracking branch 'origin/master' into KeirJames
Added getCurrentTPS() method and made the tps command to reflect the changes
Merge remote-tracking branch 'origin/master' into KeirJames

Conflicts:
	src/main/java/net/minecraft/server/PendingConnection.java
	src/main/java/org/surgedev/Surge.java
	src/main/java/org/surgedev/entity/SurgePlayer.java
	src/main/java/org/surgedev/world/SurgeWorld.java
Fixed all merge issues
Merge branch 'KeirJames'