Merge branch 'master' of https://github.com/jamesledford/PS2013_Dev_Site

Conflicts:
	homeDepot.html
Candy's Changes