Push for Joan
Merge branch 'master' of https://github.com/jrz22/teamjimsmith

Conflicts:
	homepage.html
	item_listing.html
Pushing for joan