Initial commit from local git
Merge branch 'master' of github.com:pascualy/chi-phi-app
i
Conflicts:
	Chi Phi App.xcodeproj/project.pbxproj
	Chi Phi App/AppDelegate.h
	Chi Phi App/AppDelegate.m
	Chi Phi App/Base.lproj/LaunchScreen.xib
	Chi Phi App/FirstViewController.h
	Chi Phi App/FirstViewController.m
	Chi Phi App/SecondViewController.h
	Chi Phi App/SecondViewController.m
	Chi Phi App/main.m
	Chi Phi AppTests/Chi_Phi_AppTests.m