before pulling
Merge branch 'master' of github.com:ps/Gif_Ditto