Modified .gitignore
Merge branch 'Robbin'

Conflicts:
	.gitignore