Base fix
Merge branch 'master' of https://github.com/DurandA/ch.unifr.ase2013.intro.cyan
Deleted garbage