Consolodate
Merge branch 'master' of https://github.com/BenTristem/TreeHouse

Conflicts:
	Websites/css/style.css
	Websites/index.html
Clearnup