Removed some extra text from a merge
Merge branch 'master' of github.com:1self/website