Added e-mail and github link.
Removed unnecessary space.
Resolved merge conflict.
Merge branch 'amend-my-name' of github.com:niclas-ahden/afraid-to-commit into mergeniclas