first commit
Merge https://github.com/Brockman7705/ParanoidAndroid_jflteatt