entry info php
Merge branch 'master' of github.com:bestehle/Web-Tech

Conflicts:
	Seapal/forms/entry_info.php