fixbug
mergebug fix 101
add other guys
newfile
test pull
Merge branch 'dev' of github.com:ricetuan/learngit into dev
merge bug