I was resurrected in a new branch!
commit locally
Merge branch 'sammie_new'

Conflicts:
	src/SocialNwk/Photographer/urls.py
	src/SocialNwk/media/init/Thumbs.db
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6