blah
Merge branch 'master' of github.com:brandon-dacrib/cloverleaf

Conflicts:
	app/views/lights.erb
Merge branch 'master' of github.com:brandon-dacrib/cloverleaf
initial testing using node ids