Working towards wordpress defaults
Working towards using wordpress defaults
Merge branch 'master' of https://github.com/jlcasto/alisonHarper

Conflicts:
	wp-content/themes/alisonHarper/functions.php