Separate multiple authors with a '&', looks better
Merge branch 'master' of github.com:gopheracademy/gopheracademy-web
Fixed merge conflict