added missing includes
init
init

Merge branch 'master' of https://github.com/sookee/rconteam

Conflicts:
	src/Makefile
	src/rconteam.cpp
	src/types.h
merge