Height finagling
Merge branch 'master' of https://github.com/wschneider/NetProgClient

Conflicts:
	netProgWeb.html