Added more terms and references
Merge remote-tracking branch 'origin/master'

Conflicts:
	terms.md