# Conflicts:
#	CMakeLists.txt

Resolve "implement deck class in common"

See merge request !12

Merge branch '36-implement-deck-class-in-common' of gitlab.ethz.ch:beckermar/wizard into 36-implement-deck-class-in-common

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

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

Resolve "change card class from pair to int and enum"

See merge request !14

Resolve "update class card from_json function"

See merge request !11

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

See merge request !4

Resolve "Rename Lama to wizard"

Closes #15

See merge request !2