Ignore
connected sliders as Record to main
Record: text view works, can close, autocorrect off, still needs save data
Merge branch 'tear' into Bianca

Conflicts:
	.gitignore
	MAJApp/MAJApp/Base.lproj/Main_iPad.storyboard
	MAJApp/MAJApp/Base.lproj/Main_iPhone.storyboard
	MAJApp/MAJApp/MAJApp/Base.lproj/Main_iPad.storyboard
	MAJApp/MAJApp/MAJApp/Base.lproj/Main_iPhone.storyboard
	MAJApp/MAJApp/MAJApp/ResultsViewController.h
	MAJApp/MAJApp/MAJApp/ResultsViewController.m
	MAJApp/MAJApp/MainMenuViewController.m
	MAJApp/MAJApp/ResultsViewController.h
	MAJApp/MAJApp/ResultsViewController.m
	MAJApp/MAJApp/SecondViewController.h
	MAJApp/MAJApp/SecondViewController.m
	MAJApp/TextFieldsProject/TextFieldsProject/AppDelegate.m

MAJ_2013/MultiViewApplication/MultiViewApplication.xcodeproj/project.xcw
orkspace/xcuserdata/Work.xcuserdatad/UserInterfaceState.xcuserstate
	TextFieldsProject/TextFieldsProject/Base.lproj/Main_iPad.storyboard
	TextFieldsProject/TextFieldsProject/Base.lproj/Main_iPhone.storyboard