changed the 2 listings for pest sue
Merge branch 'master' of https://github.com/cjon187/xplantX

Conflicts:

xplant.xcodeproj/project.xcworkspace/xcuserdata/jonathanchong.xcuserdata
d/UserInterfaceState.xcuserstate
	xplant/InfoViewController.xib
	xplant/InfoViewController1.h
	xplant/InfoViewController1.m
	xplant/InfoViewController1.xib
	xplant/TableViewController.xib
	xplant/TableViewController1.xib