wrapper
Merge branch 'master' of https://github.com/justkevin/agric

Conflicts:
	images/cgiar.png
wrapper