Testing sensor displays
Merge branch 'master' of https://github.com/Bradshaw/TheBridge

Conflicts:
	server/app.node.js
Restructured simulation
Merge branch 'master' of https://github.com/Bradshaw/TheBridge