Undoes the Category implementation.
Implements searchenglish feature.
Fixes typos and test numbering.
Fixes test logic error.
Merge branch 'master' of https://github.com/doctorgabi/SQL_Language_Capstone

Conflicts:
	jstudy
	lib/importer.rb
	models/word.rb
	test/test_editing_words.rb
	test/test_importing_words.rb
	test/test_word.rb
removes category table stuff.
Adds searchenglish option.
More searchenglish.