edit files, pictures
Merge branch 'master' of https://github.com/rja235/VolumeButtons

Conflicts: