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

Conflicts:
	app/.DS_Store
	app/views/.DS_Store