modified ignore file
Merge branch 'Roger'

Conflicts:
	.gitignore