Adding Marias content
Merge branch 'master' of https://github.com/soton-ecs-2014-gdp-12/presentations