John develop

Removing extra js files and fixing shopping cart errors. Validating HTML.