Merge branch 'master' of https://github.com/fuqiang89/testFirst

Conflicts:
	.idea/workspace.xml
	app/te.py