Squelette
Merge branch 'master' of https://github.com/dr40/ter-2014