dev 1_1
Merge branch 'dev' of github.com:hatmouse/learngit into dev