diff -r c926073022f4 -r 44d912089ce1 server/server.py
--- a/server/server.py	Thu Oct 06 02:05:43 2011 +0200
+++ b/server/server.py	Sat Oct 08 01:05:50 2011 +0200
@@ -9,10 +9,10 @@
     return parser.parse_args()	
 
 def main():
-	args = parse_args()
-	port = args.port
-	server = Server("localhost", port, GetHandler)
-	server.run()
+    args = parse_args()
+    port = args.port
+    server = Server("localhost", port, GetHandler)
+    server.run()
 
 from BaseHTTPServer import BaseHTTPRequestHandler
 from BaseHTTPServer import HTTPServer
@@ -20,24 +20,41 @@
 import urlparse
 
 class GetHandler(BaseHTTPRequestHandler):
-	def do_GET(self):
-		parsed_path = urlparse.urlparse(self.path)
-		message = '\n'.join(("client: %s:%i" % self.client_address,
-				     "path: %s" % parsed_path.path,
-				     "query: %s" % parsed_path.query,
-				     "params: %s" % parsed_path.params))
-		self.send_response(200)
-                self.send_header("Content-type", "application/json")
-		self.end_headers()
-                self.wfile.write("{\"time:\": 73}")
+    def do_GET(self):
+        if self.path == "/":
+            self.path = "/machine.html"
+
+        parsed_path = urlparse.urlparse(self.path)
+        message = '\n'.join(("client: %s:%i" % self.client_address,
+                             "path: %s" % parsed_path.path,
+                             "query: %s" % parsed_path.query,
+                             "params: %s" % parsed_path.params))
+        self.send_response(200) 
+       
+        resource = True
+        if parsed_path.path.endswith(".html"):            
+            self.send_header("Content-type", "text/html")          
+        elif parsed_path.path.endswith(".css"):
+            self.send_header("Content-type", "text/css")
+        elif parsed_path.path.endswith(".js"):
+            self.send_header("Content-type", "application/javascript")
+        else:
+            self.send_header("Content-type", "application/json")  
+            resource = False
+        self.end_headers()
+
+        if resource:
+            self.wfile.write(open("../client" + parsed_path.path).read())
+        else:           
+            self.wfile.write("{\"time\": 73}")
 		
 class Server(HTTPServer):
-	def __init__(self, host, port, handler):
-		HTTPServer.__init__(self, (host, port), handler)
-		self.host = host
-		self.port = port
-	def run(self):
-		self.serve_forever()
+    def __init__(self, host, port, handler):
+        HTTPServer.__init__(self, (host, port), handler)
+        self.host = host
+        self.port = port
+    def run(self):
+        self.serve_forever()
 
 if __name__ == "__main__":
 	main()