adding files to use when learning about git merges etc.