Added ignore .settings/ folder
Merge branch 'master' of https://github.com/nhkim91/TDDC76-Projekt-SI

Conflicts:
	.gitignore