Merge branch 'master' of https://github.com/jillrdoty/MayDuganGiveCamp13
Merge branch 'master' of https://github.com/jillrdoty/MayDuganGiveCamp13

Conflicts:
	.DS_Store
	footer.php