initial commit of website
merged

Merge branch 'master' of https://github.com/ninjr/website
first push