hardware integrated into web application (index_concentration)
Merge branch 'master' of https://github.com/lawrencelm/SmartBox

Conflicts:
	app.js
	index.html