updating from lenovo
pres + initial commit of writeup
fixed merges