changed timetable
Adds link to etherpad
Links to rendered version
fixing merge conflicts