.gitignore updated
Merge branch 'master' of https://github.com/torgeha/GridProject

Conflicts:
	.gitignore