Merge branch 'http-master'

Conflicts:
	.gitignore
	Build

diff --cc Build
index 444fc30f53dae783b69e73a29d5c8234d93696b8,f60241744f89cf60190d58a5e5dabb1096d7b101..1ed9db85befa7188f494ecf7db832e83285b4347
--- 1/Build
--- 2/Build
+++ b/Build
@@@ -1,32 -1,15 +1,39 @@@
 -package "msphttp"
 +package "mspnet"
  {
 -      description "HTTP client and server library";
 -      version "0.1";
 +      require "mspcore";
 +      if "arch=win32"
 +      {
 +              build_info
 +              {
 +                      library "ws2_32";
 +              };
 +      };
 +
 +      headers "msp/net"
 +      {
 +              source "source/net";
 +              install true;
 +      };
  
 -      require "mspnet";
 -      require "mspstrings";
++      headers "msp/http"
++      {
++              source "source/http";
++              install true;
++      };
+ 
 -      library "msphttp"
 +      library "mspnet"
        {
 -              source "source";
 +              source "source/net";
++              source "source/http";
                install true;
 -              install_headers "msp/http";
 +      };
 +
 +      program "netcat"
 +      {
 +              source "examples/netcat.cpp";
 +              build_info
 +              {
 +                      library "mspnet";
 +              };
        };
  };