re-updated website
Merge pull request #24 from mcwic/master

re-updated website