Added cname file to master
Removed cname, only needs to be in gh-pages branch
Updated group photo
Merge branch 'master' into gh-pages