add 'commit first'
add 'commit first'
merge
add 'create dev'
dev 1
dev 2
Update .gitignore
Merge branch 'master' of github.com:ChineseFish/GitSyntax

Conflicts:
	readme.txt
commit
Update .gitignore
2014-9-8 22-3
2014-9-18