changes in .gitignore
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
version 1.0.0