del my-libs
Merge remote-tracking branch 'origin/master'

Conflicts:
	my-js/i-mouseshow/i-mouseshow.js
del my-libs