Completed recruitment window
Merge branch 'master' of github.com:systemtwo/allegiances-and-nemeses

Conflicts:
	server/server.py