minor changes tidying code
Merge branch 'master' of https://github.com/ltb11/SightReading
merge conflicts on cameraactivity/srcameraactivity
merge conflict on project.properties
added comments
merge conflicts
implementing functionality for the play button, including using a file dialog library
refactored sightreading to sightreader