Initial commit
Merge branch 'master' of github.com:johntron/nginx-debian

Conflicts:
	README.md