update
Merge branch 'master' of https://github.com/sensa/sensa.io

Conflicts:
	_3channelsense/_3channelsense.ino