torso control (http)
Merge branch 'master' of https://github.com/masonremy/481CTeam6

Conflicts:
	src/http_controller/scripts/server.py