modify new.txt
Merge branch 'master' of github.com:mah0ne/helloworld

Conflicts:
	new.txt