nginx
ignore
nginx
ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	server-jar/bin/in_queue.properties
	server-jar/bin/in_queue.script
nginx