teste

teste
Merge branch 'master' of https://github.com/Mpro3Developer/Atelie

Conflicts:
	Socrates/socrates.db