ok
Merge branch 'master' of https://github.com/albertqiu/batch_py

Conflicts:
	etc/hosts