create server
test server
Merge branch 'test'

Conflicts:
	server.js
Revert "Merge branch 'test'"

This reverts commit d1f14b58ed6e1fd0bf3898efe98c81176887039e, reversing
changes made to fbb4d0d345a9e7216506e85d8a9b11db4b32b1be.
2 lineas
merge
fix conflicts