Changed menus and res to allow pump readings
update pump state
Merge commit '036774c'

Conflicts:
	templates/pump.html