Finished options page
Merge branch 'master' of https://github.com/matthewgrossman/MusicProductivity