init source
Merge branch 'master' of https://github.com/codergg/nginx-one

Conflicts:
	.gitignore