Added myself as an user.
Fixed conflicts.
Completed phase 1.
Fixed conflicts again...
Merge pull request #23 from kimgronqvist/gh-pages

Added myself as an user.