Merge remote-tracking branch 'upstream/master'
Updated credits with team member names
Merge branch 'master' of https://github.com/crystalist/ggc-connect