adding .gitignore
removing unused stuff and updating .gitignore
Merge branch 'develop'

* develop:
  removing unused stuff and updating .gitignore
  adding .gitignore