modified:   httplib.c
	modified:   httplib.h
Merge branch 'master' of https://github.com/joxer/HTTPicus

Conflicts:
	httplib.c
	httplib.h