123.js
Merge branch 'master' of https://github.com/howmany/newtest

Conflicts:
	123.js
testing abc merge:wq
yeah
Merge branch 'master' of https://github.com/howmany/newtest
timmy.js