Corrected a merge error and broken vocab
Corrected a merge error and broken vocab

jburns12/stixproject.github.io,jburns12/stixproject.github.io,jburns12/stixproject.github.io,johnwunder/johnwunder.github.io,STIXProject/stixproject.github.io,jburns12/stixproject.github.io,johnwunder/johnwunder.github.io,STIXProject/stixproject.github.io,STIXProject/stixproject.github.io,johnwunder/johnwunder.github.io,johnwunder/johnwunder.github.io,STIXProject/stixproject.github.io