edit remote

edit remote file
Merge branch 'master' into develop

Conflicts:
	new.txt
add new file