broken!!
Merge branch 'lists' of https://github.com/nathanjamal/kindrd into lists

Conflicts:

kindrd.xcodeproj/project.xcworkspace/xcuserdata/nathanjamal.xcuserdatad/
UserInterfaceState.xcuserstate
	www/index.html