Merge pull request #2 from cbos-team/master

fixed .gitignore
Merge pull request #5 from dupps/master

Merge pull request #2 from cbos-team/master