Merged ingnore file
Merge branch 'master' into Test-Branch

Conflicts:
	.gitignore