Tons of edits throughout
Merge branch 'master' of https://github.com/noahmanger/CK-Redesign

Conflicts:
	wp-content/themes/campkinderland/style.css