Added the user on22ax
Added to userlist.json
Fixed conflict
Fixed.
Merge pull request #27 from oskarno/gh-pages

Added the user on22ax