jstesting/Update README.md
Merge branch 'master' of https://github.com/kaycal/StarDjango

Conflicts:
	jstesting/README.md