Changes to make merging other branches easier when the definition for what class is used for strings is used (Develop Branch)
Normalizing line endings