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

Conflicts:
	PalPointerApp/src/com/example/palpointerapp/MainActivity.java
	appcompat_v7/bin/appcompat_v7.jar
Test 2
Merge branch 'master' of https://github.com/DAT255-GLPP/PalPointerApp

Conflicts:
	PalPointerApp/src/com/example/palpointerapp/MainActivity.java
	appcompat_v7/bin/appcompat_v7.jar