I was resurrected in a new branch!
commit locally
copy all file into my new file
fixed explore button active state
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6 into dev_jenn2
Merge pull request #27 from leituo56/dev_jenn2

Dev jenn2
style changes to photo detail page, fix "author" label on explore page
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6
Merge pull request #28 from leituo56/dev_jenn2

style changes to photo detail page, fix "author" label on explore page
Add to sammie new
Merge pull request #29 from leituo56/dev-xiaoli

Load user fav_make, fav_model, fav_category in user page
added style for photo detail to scroll with page
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6 into dev_jenn2
Merge pull request #30 from leituo56/dev_jenn2

added style for photo detail to scroll with page
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