edit from computer
Merge branch 'master' of github.com:maryisbusy/test

Conflicts:
	newfile.txt
ignore merge backup files