Init
Merge branch 'master' of github.com:wanbok/after-life-server

Conflicts:
	.gitignore