init
Merge branch 'master' of https://github.com/VincentLier/hackthon
init 2