new version
Merge branch 'master' of github.com:sandropaganotti/waitress-2.0

Conflicts:
	.gitignore