Modifiying this file it takes
I fixed conflict that  stefano has created
Conflicts:
	yonis_contribution
Merge branch 'master' of https://github.com/cozzini/aims-ghana