Merge pull request #1 from washingtonstateuniversity/master

modified web
js folder
Merge pull request #2 from jeremyBass/master

some quick changes that are needed
Merge pull request #3 from tzhouwsu/master

Merge pull request #1 from washingtonstateuniversity/master