Rollback
Merge branch 'dev_sammie' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6 into dev_sammie

Conflicts:
	src/SocialNwk/Photographer/static/css/base.css
	src/SocialNwk/Photographer/static/jquery.wookmark.min.js