rm subfolder gitignore file
Merge remote-tracking branch 'upstream/master'
Merge pull request #70 from 2betop/master

merge