Revert "Fixed commit"

This reverts commit e2ae632f6a1607a3e01c03c664a2b9f1e7aec1f6.

Conflicts:

	server.R