duck
duck
test
marge
marge
add js link
merge branch 'TeamJs' of https://github.com/ryans610/1215 into develop
Conflicts:
	index.html