Final Ignore?

Copied a list from the Internet.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	angleball_2.1.sdf