Olympics project 2014-06-16
Merge branch 'master' of https://github.com/BIGDIVE/BIGDIVE3-exercises