Fixed merge conflicts; merged changes with stemming

.gitignore

CMakeLists.txt

ParserEndToEndTest

StringProcessingTest

cmake-build-debug/CMakeCache.txt

cmake-build-debug/CMakeFiles/3.9.6/CMakeCCompiler.cmake

cmake-build-debug/CMakeFiles/3.9.6/CMakeCXXCompiler.cmake

...ld-debug/CMakeFiles/3.9.6/CMakeDetermineCompilerABI_C.bin

...-debug/CMakeFiles/3.9.6/CMakeDetermineCompilerABI_CXX.bin

cmake-build-debug/CMakeFiles/3.9.6/CMakeSystem.cmake

cmake-build-debug/CMakeFiles/3.9.6/CompilerIdC/a.out

cmake-build-debug/CMakeFiles/3.9.6/CompilerIdCXX/a.out

cmake-build-debug/CMakeFiles/CMakeDirectoryInformation.cmake

cmake-build-debug/CMakeFiles/CMakeOutput.log

cmake-build-debug/CMakeFiles/Makefile.cmake

cmake-build-debug/CMakeFiles/Makefile2

cmake-build-debug/CMakeFiles/TargetDirectories.txt

cmake-build-debug/CMakeFiles/clion-log.txt

cmake-build-debug/CMakeFiles/feature_tests.bin

cmake-build-debug/CMakeFiles/progress.marks