talalati
Merge branch 'master' of https://github.com/rvrita/agroinform

Conflicts:
	.DS_Store