Changed generate_keys() to read input from tty
Merge branch 'master' of ssh://78.90.17.91:55556/home/git/ssh-servd

Conflicts:
	src/server.c
	src/users.c
Corrected a conflict in generate_keys()