Added a base file system so that messages are remembered between restarts of the server
Merge branch 'file-system'

Conflicts:
	server/basic-server.js