test
Merge branch 'master' of https://github.com/jonathanws/WavyLeaf_android
Merged references to Report and Trip to Sightings

Hopefully this commit works, I had to make a local commit and work with
that. We'll find out.