addition of gitignore
Merge branch 'master' into ignore_add

Conflicts:
	.gitignore
Merge pull request #4 from M4G/ignore_add

addition of gitignore