# Conflicts:
#   src/app.module.ts
#   src/game/game.controller.ts
#   src/game/game.dto.ts
#   src/game/game.entity.ts
#   src/game/game.module.ts
#   src/game/game.service.ts
#   src/user/user.controller.ts
#   src/user/user.entity.ts

trying to finish it eventually

Gamecreation

See merge request !10

# Conflicts:
#   src/app.module.ts
#   src/mapmarkers/mapmarkers.controller.ts
#   src/user/user.entity.ts

Added socket logic for notifications

See merge request !8

Geo json2

See merge request !7

GeoJSON data to database

See merge request !6

Added relationship between tables

See merge request !3

Geo json

See merge request !2

fixed validation issues, limit requests

See merge request !1