deleted commented code
fixed conflicts
Merge branch 'master' of https://github.com/HeesungSohn/SecureGradingSystem