formatting changes with description text
Merge branch 'josh' into gh-pages

Conflicts:
	NewWebsite/index.html