Added ignore file
No need for that directory
Merge fix
Merge branch 'master' into careful

Conflicts:
	.gitignore