changed header to use page-header class
removed sidebar from well, replaced with border
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html