derp, forgot to include rule 8 :))
Merge branch 'marit' of https://github.com/lugkhast/LinguistAssistantReset.git into marit
refixed language. idk naaaa
new db
Merge branch 'marit' of
https://github.com/lugkhast/LinguistAssistantReset.git into marit

Conflicts:
	src/components/Component.java