functional version
Merge branch 'master' of https://github.com/eliks/mystudychum
still merging with osborn