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

Conflicts:
	.DS_Store
	app/.DS_Store
	app/controllers/accountant_controller.rb
accountant
Merge branch 'master' of github.com:alexandru-paduraru/servicii

Conflicts:
	.DS_Store
	app/.DS_Store
	app/controllers/accountant_controller.rb
accountant