prepping for options page
Merge branch 'master' of github.com:nikolaiwarner/Treat-Yo-Self