merge testing
Merge branch 'master' of https://github.com/wreckoner/Text_Splitter.git