test commit
Merge branch 'master' of https://github.com/agroknow/AgLR

Conflicts:
	testfolder/test.php