First two of diskrete
Merge branch 'master' of github.com:Ryugoron/university