init
Merge branch 'master' of github.com:ptphp/PtServer

Conflicts:
	.gitignore