block
Merge remote-tracking branch 'gasper/base-game' into merging-base-game-gasper

Conflicts:
	src/game/resources/resources.py
	src/main.py