blarg
Merge branch 'master' of https://github.com/ardinsmo/PinHUD

Conflicts:
	Android/PinHud/bin/PinHud.apk
	Android/PinHud/bin/classes.dex
	Android/PinHud/bin/resources.ap_