Merge pull request #1 from washingtonstateuniversity/master

modified web
Merge pull request #3 from tzhouwsu/master

Merge pull request #1 from washingtonstateuniversity/master