added delegate to new branch
no message
no message
Merge commit '1b4f342556412e8249f562e441a7d8bf4a770b63' into making_delegate

* commit '1b4f342556412e8249f562e441a7d8bf4a770b63':
  added text field to master
  no message

Conflicts:
	GitProject2.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
no message
no message
no message
no message
no message
no message
no message
no message
Merge branch 'master' into making_delegate

* master:
  no message
  no message
  no message
  no message
  error fixed
  one more error
  made an error
  added travis.yml
  no message
  no message

Conflicts:
	GitProject2.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
	GitProject2/ViewController.m
no message
no message
Merge branch 'making_delegate'

* making_delegate:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  added delegate to new branch

Conflicts:
	GitProject2.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
no message