Merge
Merge branch 'master' of github.com:Ryugoron/university
Done numme except 2b) rest