Got a core server ready, I do not know if this even works, I will assume it does.
Merge branch 'master' of https://github.com/PlasmaShaft/PlasmaShaft

Conflicts:
	PlasmaShaft/PlasmaShaft.csproj
Still trying to merge
Added back project file