Rich as author
Merge branch 'master' of https://github.com/JKiely/GitHub-Profiles-Angular-

.
fix merge conflicts