aici am adaugat prostii
Merge branch 'master' of github.com:mcanti/shiny-robot

Conflicts:
	file2.txt - conflict resolved