DetectVolume version 1
Merge branch 'master' of github.com:willcrichton/mystro

Conflicts:
	www/app.js
	www/js/data.js