remove if blocks
refactored some things in mainscreen package
Refactored Map
Refactored MyInfo
Merge branch 'master' of https://github.com/ggc-itec/ggc-connect
refactored gym package
refactored gym package
Merged GPA Calculator with GGC Connect
Added icon for GPA Calculator