admin
Merge branch 'master' of https://github.com/mengci/guitar_email_list

Conflicts:
	MusicSiteDB/guitarList/admin.py
	MusicSiteDB/guitarList/models.py