scrum update
slides in reveal + fri
merge