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

Conflicts:
	appcompat_v7/bin/appcompat_v7.jar