new file:   test.js
	new file:   test2.js
	deleted:    test2.js
	new file:   test2.js
Merge branch 'master' of https://github.com/alterx/patching-test1

Conflicts:
	.DS_Store

	modified:   .DS_Store