added grades & iclicker
Merge branch 'server' of https://github.com/JFrei86/HWserver into server
Merge branch 'server' of https://github.com/JFrei86/HWserver into server
small changes