added gitignore
Merge branch 'develop'
removed gitignored files