blab
Merge branch 'master' of https://github.com/CKovacs/JnRProject

Conflicts:
	JnR/Assets/Scripts/Utitlity/PlayerState.cs