Use Skeleton 1.2
Use bold for header fonts
Merge branch 'develop'

Conflicts:
	css/skeleton-1.1.min.css
Adjust the size of h1 and h2 elements
Merge branch 'develop'