New lamp
Merge branch 'master' of github.com:LGJ-Poitiers/Game