Test commit
Merge pull request #20 from cmcoffin/x_paparazzi

Test commit from Chris