added static files, slight bug fix in search
fixed merge conflicts