branch1 added
Merge branch 'branch2' into branch1

Conflicts:
LocalGit/ViewController1.m