-More cleanup. Things are breaking.
Merge branch 'master' of git@github.com:jackMannino/OWASP-GoatDroid-Project.git