Merging again because I was merging in detached state

Samo Penic

2016-12-06 c2c6364dc7d23f21dabd2179e775e93ba4eeb252

 python/trisurf/WebTrisurf.py

@@ -1,8 +1,11 @@
import subprocess
from urllib.parse import urlparse
import sys, os
if sys.version_info>=(3,0):
   from urllib.parse import urlparse
else:
   from urlparse import urlparse
import http.server
import socketserver
import sys, os

#Web server
class TsWEB(http.server.BaseHTTPRequestHandler):