sdfsdf d
sdfsdf d
sdfsdf d
sdfsdf d
sdfsdf d
sdfsdf d
Merge branch 'master' of https://github.com/jiangchanghong/newa

Conflicts:
	.idea/misc.xml
	t.txt
Merge pull request #1 from jiangchanghong/master

master