Virus attack
Merge branch 'master' of https://github.com/cozzini/aims-ghana
Merge branch 'master' of https://github.com/cozzini/aims-ghana

Conflicts:
	contribution.longjay
Merge branch 'master' of https://github.com/cozzini/aims-ghana