Added Subheading
H6 Change
Merge branch 'master' into andrew

Conflicts:
	css/bootstrap.css