merge with no-ff
bad liao
Merge branch 'master' of github.com:lostforsaya/learngit into dev