Merge pull request #30 from huxuan/master

Better background image.
Revert "Better background image."
Merge pull request #31 from CAPU-ENG/revert-30-master

Revert "Better background image."
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/images/bg.jpg
	bbs/content/style.css
	bbs/editpid/index.php
	bbs/edituser/index.php
	bbs/home/index.php
	bbs/index/style.css
	bbs/lib/bg.jpg
	bbs/login/index.php
	bbs/main/style.css
	bbs/register/index.php
	bbs/search/index.php
	bbs/user/index.php
	static/img/bg.jpg