Instructions on disable user
Merge branch 'master' of github.com:cnm/inesc_server

Conflicts:
	README.rst