Local conflict
Merge branch 'master' of github.com:gabipetrovay/iulia

Conflicts:
	README.md