Convert to Unix line endings, in an attempt to fix the merge conflict.
Merge remote-tracking branch 'upstream/master' into libcFixes

Conflicts:
	libc/ctype.c
	libc/string.c
Merge pull request #14 from gbl08ma/libcFixes

libc string function bugfixes.
Merge remote-tracking branch 'upstream/master'