trying to try
Merge branch 'master' of https://github.com/blackzky/demo_angel

Conflicts:
	rj.txt
fix bits