no message
no message
added travis.yml
made an error
one more error
error fixed
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