action model
Merge branch 'master' of https://github.com/alexandru-paduraru/servicii

Conflicts:
	.gitignore
git ignore