hej
Merge branch 'master' of https://github.com/DAT255-GLPP/PalPointerApp

Conflicts:
	PalPointerApp/bin/jarlist.cache