Test server done - runnning on port 3000
Merge conflict solved