Fixed some stuff :p
ssh :p
Some small changes
Merge branch 'master' of https://github.com/MiniGameShawMatt/Hub.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs