Listener BS
Merge branch 'Refactoring' of github.com:jackbatzner/COEN-4720-Android into Refactoring