Merge branch 'master' of /Users/EricPutney/AndroidstudioProjects/ShotTracker with conflicts.
JPG file name changes