Website updates
stupid f-ing thing
fixed merge in index.html