Resolved merge conflicts by using remote versions

CheckerCorrector/Checker.java

CheckerCorrector/Corrector.java

CheckerCorrector/DBinterface/DBinterface.java

CheckerCorrector/GUI/HighlighterGUI.java

CheckerCorrector/HashTableMaker/HashTableMaker.java

CheckerCorrector/SQLite/DutchTranslation.txt

CheckerCorrector/SQLite/hash_database_english.db

CheckerCorrector/SQLite/newdatabase.db

CheckerCorrector/SQLite/token_database_dutch.db

CheckerCorrector/SQLite/token_database_dutch_updated.db

CheckerCorrector/SQLite/token_database_english.db

CheckerCorrector/SQLite/token_database_english_updated.db

CheckerCorrector/StateMachine/State.java

...rCorrector/Translator/DirectTranslatorDutchToEnglish.java

...rCorrector/Translator/DirectTranslatorEnglishToDutch.java

CheckerCorrector/TypoCorrector/TypoCorrector.java

CheckerCorrector/util/ArgumentParser.java

Crawler/src/main/java/2-output_Dutch2.txt

Crawler/src/main/java/Debug.java

Crawler/src/main/java/RobotsTXT.java