copy all file into my new file
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
Load user fav_make, fav_model, fav_category in user page
Merge pull request #29 from leituo56/dev-xiaoli

Load user fav_make, fav_model, fav_category in user page
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6 into dev_jenn2