Tweaks
Merge branch 'master' of https://github.com/CatholicReliefServices/2014-ICT4D-Conference-website

Conflicts:
	Website/2014-site-files/Build/css/compiled-custom-styles.css
	Website/2014-site-files/Build/index.html