asddas
Merge branch 'master' of https://github.com/alexandru-paduraru/razaboi

Conflicts:
	app/controllers/valori.in