Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'master' of https://github.com/robccarey/SkyAccessoriesWebsites
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp
Merge branch 'bootstrap'

Conflicts:
	web/bootstrap/index.jsp