Update nothing.text
Revert "second revision"

This reverts commit 8e957ad408ed53aa12de050d4d57a6fead8242ee.
Merge branch 'master' of https://github.com/cbao/Practice

Conflicts:
	nothing.text
Merge branch 'master' into newbranch