Index works with bootstrap formatting.
Starting to seperate out WebLab portfolio
Merge branch 'master' of https://github.com/slitsch/litsGeo

Conflicts:
	css/carpetCalc.css
	css/styles2.css
	index.html
	indexFlex.html
	js/price2D.js