Updates, now working with postfix
Merge branch 'master' of https://github.com/fish-guts/webprog

Conflicts:
	index.php
some updates, now working with postfix