attempting to go back to prev. version of server.cpp
Merge branch 'master' of https://github.com/acm-uiuc/Kinect-Mapper

Conflicts:
	controls/server.cpp