Fixing some stuff
Merge branch 'master' of https://github.com/CSE5914/Eduvisor