shifted de numbas
binbinbinbin
Merge remote-tracking branch 'origin/master'

Conflicts:
	Link - Ghost Hunter/bin/Link - Ghost Hunter.apk
	Link - Ghost Hunter/bin/classes.dex
	Link - Ghost Hunter/bin/resources.ap_
Merge branch 'master' of https://github.com/fabiopk/android_project.git