Merge pull request #4 from liuggio/master

A better website