first commit CTA
Merge branch 'master' of https://github.com/bmros/ch.unifr.ase2013.cars.green