trash
Merge branch 'master' of https://github.com/ycliuhw/MySQL_DB_Website

Conflicts:
	MySQL_DB_Website/settings.pyc
	MySQL_DB_Website/urls.pyc
	charts/views.pyc
diff