some new todos
Merge branch 'master' of github.com:glaubinix/conference-schedule