Merge branch 'master' into Dev_TuoLei
Merge branch 'master' into Dev_TuoLei
Restful service

Add restful service sample
django rest framework needed
markdown needed
django_filter needed
Merge branch 'Dev_TuoLei'
Merge pull request #1 from leituo56/Dev_TuoLei

Dev tuo lei
Description

Changed project description
Merge pull request #2 from leituo56/Dev_Jenn

Description merged. Well done Jenn
Try Conflict

Try Conflict, get some sense
Merge branch 'master' into Dev_TuoLei
Merge branch 'Dev_TuoLei'
Sammie's testing 

testing
Login/Signup Pages

-Created login page as “login2.html”
-Created signup page as “signup2.html”
-Styled pages using “pagestyle.css”
Spell Check
Merge pull request #4 from sammiexiu/patch-1

Sammie's testing
Well done
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei

Conflicts:
	README.md
Try to resolve conflict
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6

Conflicts:
	README.md
Try to resolve conflict
Merge pull request #6 from leituo56/Dev_TuoLei

Dev tuo lei
Merge pull request #5 from leituo56/Dev_Jenn

Dev jenn. Jenn. It's better to put html & css files in Design folder
Merge branch 'master' of https://github.com/leituo56/SocialNetworkArtist_CMPE272_Group6 into dev-xiaoli

Conflicts:
	README.md