new commit
Merge branch 'master' of https://github.com/cozzini/aims-ghana

Conflicts:
	hammed_contribution