first commit to github
Merge branch 'master' of github.com:zhangyanrui/DjangoDemo
change test1.rc