Testing merging
Make changes as requested by Amo
Keep both sets of changes
Merge pull request #1 from impactapplications/testing

Testing merging. Closes #2.