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

Conflicts:
	server-jar/bin/in_queue.properties
	server-jar/bin/in_queue.script
nginx
 Merge branch 'master' of github.com:vderkach/project2action

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