attend to conferences markup
Merge branch 'master' of github.com:frontend-rescue/keep-up-to-date