Merge branch 'master' of https://github.com/gagallo7/MC911

Conflicts:
	Project2/pacote/src/llvm/Codegen.java
Merge branch 'master' of https://github.com/gagallo7/MC911