manage origin
Merge branch 'master' of https://github.com/lmivsct/hackathon2