Added a .gitignore
Merge remote-tracking branch 'origin/master' into Flemming

Conflicts:
	.gitignore