Merge branch 'master' of https://github.com/aceisScope/zodiac

Conflicts:
	zodiac.xcodeproj/project.pbxproj
	zodiac/zodiacAppDelegate.m
Fixing the conflict
Rename appDelegate
Fixing file name
Added Table on Select Zodiac VC
fix merge conflicts
Merge branch 'master' of https://github.com/aceisScope/zodiac

Conflicts:
	zodiac.xcodeproj/project.pbxproj