add
Merge branch 'master' of https://github.com/Charlesdong/MyProject

Conflicts:
	.idea/workspace.xml
	MyProject/settings.py
	MyProject/settings.pyc