setting up for local root
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/after-class-blog

Conflicts:
	wp-content/themes/.DS_Store