Merge branch 'master' of github.com:pat-thomas/a-robot-hums

Conflicts:
	robot-server/src/robot_server/core.clj
Merge branch 'master' of github.com:pat-thomas/a-robot-hums