Adding front server
Fixed merge conflict with package.json