# Conflicts:
#	CMakeLists.txt

# Conflicts:
#	src/common/game_state/player/hand.cpp
#	src/common/game_state/player/player.cpp
#	src/common/game_state/player/player.h

# Conflicts:
#	CMakeLists.txt

Merge branch '18-adapt-game-state-class-and-add-class-roundstate' of gitlab.ethz.ch:beckermar/wizard into 18-adapt-game-state-class-and-add-class-roundstate

updated logic in game state and deleted parts that are moved to round state, implemented connection to round state, finish game logic still missing

Resolve "update class card from_json function"

See merge request !11

Resolve "Update classes card, hand and player (in common)"

See merge request !4

updated logic in game state and deleted parts that are moved to round state, implemented connection to round state, finish game logic still missing

Resolve "Rename Lama to wizard"

Closes #15

See merge request !2