space
Merge branch 'master' of https://github.com/rothariel/aimnegochat.git
Update PostQuestionnaire to only show the "human" questions after the
user answered whether the partner is a computer or a human
Merge branch 'master' of https://github.com/rothariel/aimnegochat.git

Conflicts:
	server.js
Add user's log
Merge branch 'master' of https://github.com/rothariel/aimnegochat.git