Delete urls.py.orig
Delete urls.py~
Merge pull request #9 from hsfzxjy/master

6-3
FIX BUG
Merge branch 'master' of https://github.com/hfercc/mese2014
Merge pull request #10 from hsfzxjy/master

6=6
Merge branch 'master' of https://github.com/hfercc/mese2014
Merge pull request #11 from hsfzxjy/master

6-6
Merge branch 'master' of https://github.com/hfercc/mese2014
Merge pull request #12 from hsfzxjy/master

6-7
6-7
6-7
Merge branch 'master' of https://github.com/hfercc/mese2014
6-8
MERGE
Before Merge
Before Merge
Before Merge
MERGED
MERGE