getting upstream changes

.gitignore

Makefile

NTMakefile

deps/include/mbedtls/cipher.h

deps/include/mbedtls/ssl_ciphersuites.h

deps/lib/nt_i386/glew32.dll

deps/lib/nt_i386/libbz2.a

deps/lib/nt_i386/libfreetype.a

deps/lib/nt_i386/libglfw.a

deps/lib/nt_i386/libharfbuzz.a

deps/lib/nt_i386/libpng.a

deps/lib/nt_i386/libpolarssl.a

deps/lib/nt_i386/libz.a

src/CFGFileParser.cpp

src/CFGFileParser.h

src/pnm.h

src/target.h

src/tlsf-winnt.h

src/tlsf.c

src/tlsf.h