Update my profile info and avatar.
Merge conflict fix
Merge branch 'master' of github.com:leeourand/coolest-carrots