fixed trivial conflicts
-rw-r--r-- 5 .gitignore
drwxr-xr-x - Doc
-rwxr-xr-x 3077 INSTALL.sh
-rw-r--r-- 339 TODO.stream_iframe
drwxr-xr-x - web