Merge pull request #6 from flubbes/update-1

design updates for jordi
Merge pull request #9 from flubbes/update-1

jordi up to date
CHANGED head removed
-<<<<<< HEAD DELETED

Raar stukje gefriemel wat eruit is gehaald om steeds errors te voorkomen
Merge pull request #11 from flubbes/jordi

UPDATED code from update1 to the newest version
Merge branch 'update-1' of https://github.com/flubbes/GamePad-Android into update-1
Merge branch 'update-1' into roy

Conflicts:
	main/java/com/gamepad/lib/update/AutoUpdater.java