second commit
merge branch 'master' of https://github.com/Perilynn/gifto-test
merging with local
second  commit