git ignore, google site maps
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/art-africa

Conflicts:
	.gitignore