3/4 through tut 2
fixed conflicts
fixed conflicts