Update .gitignore
Merge pull request #4 from HACKhalo2/patch-1

Update .gitignore
Merge branch 'origin_develop' into develop