very berry broken code

: (
Merge branch 'master' of https://github.com/Blicary/Roller-Knights

Conflicts:
	KORT/Assets/Scripts/GeneralHelpers.cs