Edited version
Merge pull request #1 from zxhadow/new_website

Edited version