Cleaned up Aula 3 directory
Cleaning up conflicts with origin