adding settings buttons
Merge branch 'master' of https://github.com/deannazhu514/15237-AND
track buttons in settings