Add dockerfile.
Add data to a file.
Add data to a file.
Add data to a file.
Add data to a file.
Add data to a file.
Add data to a file.
Add dockerfiles in subdirs.
Add dockerfiles in subdirs.
Add dockerfiles in subdirs.
Change contents.
Change contents.
Change contents.
Change contents.
Add a dockerfile that requires adds.
Merge remote-tracking branch 'origin/master' into anewbranch

Conflicts:
	afile