minor changes
Merge branch 'master' of https://github.com/Daiver/goods_uncover
merge and change .gitignore