Now it should work
Revert "mergeconflict resolevd"

This reverts commit 5697fc35b54e3bd2be43b79f47c310e7c7a3bd7e.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DieOrSki/game_src/DieOrSki.cpp
	DieOrSki/game_src/Player.cpp