Fixing website -> web site
Updating website -> web site
fix #805 merge conflict
Merge pull request #841 from mollybostic/master_local

fixing merge conflict #805