Testing edit and add files
Merge pull request #2 from torjohn/branch1

Testing edit and add files
Merge is fine.