Included Ajax for shopping cart.
fixed up indentation
fix merge