Add a file on a branch.
Add another branch file.
Add another branch file.
Update a branch file
Update a branch file
Update a branch file
Update a branch file
A new commit.
A new commit.
A new commit.
A new commit.
A new commit.
A new commit.
A new commit.
A new commit.
New commit.
Add some contents in subdirs.
Merge remote-tracking branch 'origin/master' into anewbranch

Conflicts:
	afile
Test branch commit.
Instigate a push.