final agenda
Merge branch 'master' of github.com:sse-ws/sse-ws.github.com

Conflicts:
	agenda.html