# Conflicts:
#	src/common/game_state/game_state.h

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

# Conflicts:
#	src/common/game_state/game_state.cpp
#	src/common/game_state/round_state.cpp
#	src/common/game_state/round_state.h

# 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

# 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