Merge branch 'master' of https://github.com/Rarlegend/AcademicArbiter
Merge branch 'aman'
idk
Merge pull request #3 from Rarlegend/master

everything