merge

package-lock.json

package.json

src/graphql/resolvers.js

src/server.js

src/views/home.pug