secod commit
Merge https://github.com/gaukes/website