Initial Commit
TestGit

Test commit
TestGit

test TestBranch
TestGit

add master bottom
merge branch 'TestBranch'

test merge branch
TestGit

add nslog("1")
TestGit

add nslog("2")
Merge branch 'TestBranch'

test merge
Conflicts:
	TestGit/AppDelegate.m
TestGit

add new file
Merge branch 'master' of https://github.com/LifreshmanTestGit/github_test

Test remote branch