fixed file references and deleted unused files
fixed images file location for github
sync
Merge branch 'master' of https://github.com/wjshea1/CalvaryiPhoneApp

Conflicts:
	.gitignore
	CalvaryiPhoneApp.xcodeproj/project.pbxproj

CalvaryiPhoneApp.xcworkspace/xcuserdata/wjshea.xcuserdatad/UserInterface
State.xcuserstate