ignoring some files
Merge branch '1.01' into 1.02

* 1.01:
  ignoring some files

Conflicts (resolved):
	.gitignore