UPDATE OUSE
Merge branch 'master' of https://github.com/harryhychu/ouse

Conflicts:
	client_login_successful.php
	css/main_style.css
	header.php
	images/0.jpg
	images/1.jpg
	images/2.jpg
	images/3.jpg
	images/footer.png
	images/logo4.png
	index.php
	logout.php
	mysql/mysql_connect.php
	order.php
	order_finish.php
	register.php
	register_finish.php