MrZogs test1 e 5
Merge origin/master

Conflicts:
	MD_Classes.py
teste12