Stripe Finished
Home Page Updated
Merge remote-tracking branch 'origin/Chenyi'

Conflicts:
	application/controllers/showroom.php
	application/controllers/stripe_controller.php
	application/models/model_users.php