Merge branch 'master' of github.com:happanda/C_plus_plus