first commit
Adding myself to list
fixed conflict
Merge pull request #16 from wibjer/gh-pages

first commit