Server up and running
server and dev merged