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

Conflicts:
	.DS_Store
	Gemfile
	Gemfile.lock
	config/environments/test.rb
	config/initializers/wrap_parameters.rb