hangs to index
Merge branch 'master' of github.com:r-barnes/airquality

Conflicts:
	src/routes/index.js
Merge branch 'master' of github.com:r-barnes/airquality
Text messaging working
Merge branch 'master' of github.com:r-barnes/airquality