some thing
add file
Merge branch 'master' of https://gist.github.com/7860492
do
Conflictsi:
	Test_Django
add new file to remote
Merge branch 'master' of github.com:xiaowoniu2012/webSite