update readme, add rest slides
fix conflicts