Create .gitignore
Merge branch 'master' into Yaro

Conflicts:
	.gitignore
Merge pull request #7 from berna228/master

Merge back to Yaro