Merged GPA Calculator with GGC Connect
Added icon for GPA Calculator
stuff
Finishing the project
merging upstream
Error handling float to int
Fixed orientation bug
Delete Thumbs.db
Delete Thumbs.db
Delete Thumbs.db
Delete Thumbs.db
updated .gitignore
Merge branch 'master' of https://github.com/jordan-r-smith/ggc-connect
Fixing conflict
Fixing conflicts
Fixing conflicts
fixing more conflicts
fixing conflicts
Fixing strings.xml conflict
Merge pull request #202 from jordan-r-smith/master

Merge GPACalculator with ggc-connect