Two commits together from tentative.. how to merge just a directory.. too lazy.
anyway, stuff to make a website for it and some minor stuff