finished mix3
Merge branch 'master' of github.com:teloon/notes