update info
Merge branch 'master' of github.com:giannic/giannic