add a
add
Merge branch 'bug'

Conflicts:
	a
kkdkk
Merge branch 'bug'

Conflicts:
	a
i
Merge branch 'dev'

Conflicts:
	a
iiii
ad
Merge branch 'master' of https://github.com/angrysnail/workspace