27/02/14
Merge branch 'master' of github.com:maxime-schuck/lib