add bossji
Add bossji2
Add msg for feature2 branch
Merge branch 'feature2'

Conflicts:
	readme.md