touched arduino nimbus
Merge branch 'master' of https://github.com/goose1987/equilibrium

Conflicts:
	arduino/nimbus/nimbus.ino