more testing
First commit then push
Merge branch 'gh-pages'

Conflicts:
	Aquaponics.ino
removing bs