Socket Talks
Merge branch 'light_ctrl' of https://github.com/wetherbeei/SD2013-UIUC into light_ctrl

Conflicts:
	lox-conn.py
light_ctrl __init.py