old
Resolving diff
Merge branch 'gh-pages' of https://github.com/JernejB/slides into gh-pages
Cleaning
Merge branch 'gh-pages' of https://github.com/JernejB/slides into gh-pages