Banned pronunciations
Table colors
Merge remote-tracking branch 'origin/master'

Conflicts:
	FlashCards/.settings/org.eclipse.core.resources.prefs