Ignore .orig files
Clean up apitester merge markers
Merge pull request #3 from bowcot84/tube_resource

Tube resource