First commit
Merge remote-tracking branch 'choose_remote_name/TestBranch2' into
TestBranch2

Conflicts:
	.gitignore