CW text added
Merge branch 'master' of github.com:baanant/diplomityo