merge task 4 and 5, update getting started