rootpasswd
Merge branch 'master' of https://github.com/Augustles/py

Conflicts:
	xx.txt