Xubuntu save
Merge branch 'master' of https://github.com/PengK/Django_DiscussionBored

Conflicts:
	site_alpha/db.sqlite3
	site_alpha/forum/urls.pyc
	site_alpha/forum/views.pyc
	site_alpha/polls/urls.pyc
	site_alpha/polls/views.pyc
	site_alpha/site_alpha/settings.pyc
	site_alpha/site_alpha/urls.pyc
Merge branch 'master' of https://github.com/PengK/Django_DiscussionBored

Conflicts:
	site_alpha/db.sqlite3
	site_alpha/forum/models.pyc
	site_alpha/forum/urls.pyc
	site_alpha/forum/views.py
	site_alpha/forum/views.pyc
	site_alpha/site_alpha/urls.pyc