gitignore
Revert "gitignore"

This reverts commit 996e28af576a2a935cb949c5fa898695597f27ef.
Merge branch 'master' into develop