Fixes
Bug fixes
Merge branch 'master' of https://github.com/hexC0D3/Grades.git