server update
slight crappy updates from pc
CHANGES!
Removed erroneous addition
Merge branch 'kevr'

Conflicts:
	server/src/main.cpp