Merge pull request #3 from cdchild/master

Merge back ignoring of bin and obj
Merge pull request #4 from cdchild/develop

Merge pull request #3 from cdchild/master