config
Merge branch 'master' of ssh://git@github.com/Lapin-Blanc/Photoshot.git