no message
Merge branch 'master' of https://github.com/nuzrub/CG-NP2-2014-2