Added João changes

It was conflicting so I replaced my changes on the grades by Joao's
version