shipping current state to ui
Merge branch 'master' of https://github.com/masonremy/481CTeam6

Conflicts:
	src/http_controller/index.html
	src/http_controller/js/main.js