Merge pull request #1 from washingtonstateuniversity/master

modified web