leituo56/SocialNetworkArtist_CMPE272_Group6 — pull request #6 by leituo56 (2014-04-20 05:13:48+00:00)
Title: Dev tuo lei

Try to resolve conflict