initial commit, creating repository
Merge branch 'master' of https://github.com/josmcg/website
because github is making me