changed button colors
Revert "changed button colors"

This reverts commit 29c14dca86d458522b37d99959a22373913b6968.
Merge branch 'master' into gh-pages