add js
Merge branches 'master' and 'newstory' of https://github.com/szriafan/demo into newstory
add js
Merge remote-tracking branch 'origin/master'

Conflicts:
	about.html
Merge branch 'newstory'