modified:   requests.c
	deleted:    http.c
	deleted:    http.h
	deleted:    main
	modified:   net.c
	modified:   net.h
	suppor logging
	change Makefile

	modified:   Makefile
	modified:   main.c
	modified:   parse.c
	modified:   parse.h
	modified:   requests.c
	modified:   response.c
	modified:   response.h
	fix bugs for serve_dir and logging
	modified:   parse.c
	modified:   requests.c
	modified:   response.c
	wrap err_response with sws_response
	modified:   index.html
	modified:   parse.c
	modified:   response.h
	support if modified since
	modified:   main.c
	modified:   parse.c
	modified:   parse.h
	modified:   requests.c
	modified:   response.c
	only GET cgi
	support post cgi
	new file:   cgi-bin/get.cgi
	new file:   cgi-bin/post.cgi
	new file:   cgi-bin/test.cgi
	modified:   parse.c
	modified:   requests.c
	new file:   test.html
merged with mgu_sws
Merge branch 'mgu_sws' into wksws

Conflicts:
	requests.c

1 using libmagic to get mime type