20130523 commit

20130523 commit all new
Merge branch 'master' of https://github.com/mxm145/myjs

Conflicts:
	slide1-min.js
	slide2.js
	slide6.js