button goes back to initial styling by default
fixed conflict
Merge branch 'master' of https://github.com/ADstruc/waitable