Adding a quick file to test merging with smartgit