Made changes to data architecture, fixed grade model problem
Merge branch 'master' of github.com:brandoshmando/final-project