hello
Merge remote-tracking branch 'origin/master'
speed
Merge remote-tracking branch 'origin/master'

Conflicts:
	end.js
speed