Create README.md
Update manage.py
Merge branch 'master' into tryingbranch

Conflicts:
	mikehibbert/manage.py