Actual App Directory, site is in WWW
Merge branch 'master' of https://github.com/mbatilando/givingGoods

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/mbatilando/givingGoods