Merge pull request #1 from TeamPalmTree/master

Pulling from TPT
Update proguard-project.txt
Merge pull request #4 from drayfar/master

revert test