closes #70
Merge branch 'master' of github.com:m1kc/uonline