Inca o data
Merge branch 'master' of https://github.com/Andi24/Test

Conflicts:
	buna.txt