more stuff in .gitignore
Merge branch 'atam'

* atam:
  more stuff in .gitignore

Conflicts:
	.gitignore