fsp django learning first README.rst modify
by fsp 20130305_17_43
conflict test
Merge branch 'master' into ticket_exercise

Conflicts:
	README.rst