responsive registration
shipping conflicted

Conflicts:
	application/views/templates/shipping.php