smth
Merge branch 'master' of https://github.com/AKomanda/KuPRA.git

Conflicts:
	KuPRA/src/display/fridgeDisplay.php