added nickname
Merge branch 'master' of https://github.com/schifano/codelab