ignored
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/after-class

Conflicts:
	.DS_Store
	themes/afterclass2/.DS_Store