Adding eclipse files to .gitignore - fix by Kristian Sallberg
Merge branch 'master' of github.com:jimdowling/id2210-vt14
Merge https://github.com/jimdowling/id2210-vt14

Conflicts:
	.gitignore