Some changes
Merge branch 'master' of github.com:mdesanti/pf

Conflicts:
	server
	server.hs
Merge branch 'master' of github.com:mdesanti/pf

Conflicts:
	server
	server.hs