Merge pull request #1 from rhavill/ricardo

Added test file.
Revert "Added test file."

This reverts commit 73693dcae179e8097497e2d5886d16578f9e22d5.
Merge remote-tracking branch 'origin/ricardo'
renamed another test file
modified another test file from master branch
resolving a merge conflict.