Base classes
Merge branch 'master' of https://github.com/Supermomo/psychic-glowing-octo-bear