profile
merge
photo upload, profile pic upload
Merge branch 'master' of https://github.com/sigepberkeley/calsigep.com