finished personal site
added all
fixed merge