<<<<<<< HEAD
Merge branch 'master' of github.com:nicolas-fricke/semmul2013-group1