adding that guy
Merge branch 'MergeLocally'
Merge branch 'master' of https://github.com/blakeholl/CarriageReturnLineFeed

Conflicts:
	src/TestApp/TestApp.ConsoleApp/Program.cs