warmup2 finished
Merge branch 'master' of https://github.com/githubmichel/ese2014_warmup2