wip
Merge branch 'master' of https://github.com/nicoeclair/prcd2014-tdp4
wip