change ForeignKey to ManyToMany
Merge branch 'testBlank' of github.com:yuealves/paper into testBlank

Conflicts:
	statistic/models.py