Quite random stuff before I leave Cracow
Merge branch 'develop' of github.com:zosiakropka/academia into develop